Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Pull sparc fixes from David Miller:
 "Several small bug fixes and tidies, along with a fix for non-resumable
  memory errors triggered by userspace"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Handle PIO & MEM non-resumable errors.
  sparc64: Zero pages on allocation for mondo and error queues.
  sparc: Fixed typo in sstate.c. Replaced panicing with panicking
  sparc: use symbolic names for tsb indexing

1 files changed, 8 insertions, 4 deletions

diff --git a/netsniff-ng.c b/netsniff-ng.c
index 682fb39..331e476 100644
--- a/netsniff-ng.c
+++ b/netsniff-ng.c
@@ -474,8 +474,10 @@ static void receive_to_xmit(struct ctx *ctx)
 		}
 
 		ret = poll(&rx_poll, 1, -1);
-		if (unlikely(ret < 0))
-			panic("Poll failed!\n");
+		if (unlikely(ret < 0)) {
+			if (errno != EINTR)
+				panic("Poll failed!\n");
+		}
 	}
 
 	out:
@@ -985,8 +987,10 @@ static void recv_only_or_dump(struct ctx *ctx)
 		}
 
 		ret = poll(&rx_poll, 1, -1);
-		if (unlikely(ret < 0))
-			panic("Poll failed!\n");
+		if (unlikely(ret < 0)) {
+			if (errno != EINTR)
+				panic("Poll failed!\n");
+		}
 	}
 
 	bug_on(gettimeofday(&end, NULL));