Merge branch 'parisc-3.16-6' of git://git.kernel.org/pub/scm/linux/ke…

…rnel/git/deller/parisc-linux Pull parisc fixes from Helge Deller: "We have two trivial patches in here. One removes the SA_RESTORER #define since on parisc we don't have the sa_restorer field in struct sigaction, the other patch removes an unnecessary memset(). The SA_RESTORER removal patch is scheduled for stable trees, since without it some userspace apps don't build" * 'parisc-3.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Eliminate memset after alloc_bootmem_pages parisc: Remove SA_RESTORER define
neviim · Jul 25, 2014 · 0e6103e · 0e6103e
2 parents 0246544 + 9794144
commit 0e6103e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h
@@ -69,8 +69,6 @@
 #define SA_NOMASK	SA_NODEFER
 #define SA_ONESHOT	SA_RESETHAND
 
-#define SA_RESTORER	0x04000000 /* obsolete -- ignored */
-
 #define MINSIGSTKSZ	2048
 #define SIGSTKSZ	8192
 

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
@@ -728,7 +728,6 @@ static void __init pagetable_init(void)
 #endif
 
 	empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
-	memset(empty_zero_page, 0, PAGE_SIZE);
 }
 
 static void __init gateway_init(void)
-Original file line number
+Diff line change
@@ Expand Up / @@ -728,7 +728,6 @@ static void __init pagetable_init(void) @@
     #endif
     	empty_zero_page = alloc_bootmem_pages(PAGE_SIZE);
-    	memset(empty_zero_page, 0, PAGE_SIZE);
     }
     static void __init gateway_init(void)
@@ Expand Down @@