diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-25 16:17:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-25 16:17:06 -0700 |
| commit | 0e6103e5e728db166df2d868263a68d07eaa1326 (patch) | |
| tree | be65e8d9b212e3b2f45829eb36196c885f6f31ff | |
| parent | 0246544fc9abcc5850cfc4cfcfe6c16067541024 (diff) | |
| parent | 9794144d5a95ca90cb9165a0aae1af155f1d8676 (diff) | |
| download | linux-0e6103e5e728db166df2d868263a68d07eaa1326.tar.gz | |
Merge branch 'parisc-3.16-6' of git://git.kernel.org/pub/scm/linux/kernel/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
| -rw-r--r-- | arch/parisc/include/uapi/asm/signal.h | 2 | ||||
| -rw-r--r-- | arch/parisc/mm/init.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/parisc/include/uapi/asm/signal.h b/arch/parisc/include/uapi/asm/signal.h index a2fa297196bc1..f5645d6a89f2c 100644 --- 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 index ae085ad0fba03..0bef864264c0b 100644 --- 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) |