diff options
| -rw-r--r-- | arch/m32r/Makefile | 2 | ||||
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 4 | ||||
| -rw-r--r-- | arch/m32r/mm/ioremap.c | 10 | ||||
| -rw-r--r-- | include/asm-m32r/resource.h | 2 | ||||
| -rw-r--r-- | include/asm-m32r/socket.h | 20 | ||||
| -rw-r--r-- | include/asm-m32r/unistd.h | 20 |
6 files changed, 24 insertions, 34 deletions
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile index 1870e1723414..953804c08552 100644 --- a/arch/m32r/Makefile +++ b/arch/m32r/Makefile @@ -25,7 +25,7 @@ aflags-$(CONFIG_ISA_M32R) += -DNO_FPU -Wa,-no-bitinst CFLAGS += $(cflags-y) AFLAGS += $(aflags-y) -CHECK := $(CHECK) -D__m32r__=1 +CHECKFLAGS := $(CHECK) -D__m32r__=1 head-y := arch/m32r/kernel/head.o arch/m32r/kernel/init_task.o diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 1e4971f0f69a..729a2645a03f 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S @@ -27,6 +27,7 @@ SECTIONS .text : { *(.text) SCHED_TEXT + LOCK_TEXT *(.fixup) *(.gnu.warning) } = 0x9090 @@ -81,9 +82,6 @@ SECTIONS __setup_start = .; .init.setup : { *(.init.setup) } __setup_end = .; - __start___param = .; - __param : { *(__param) } - __stop___param = .; __initcall_start = .; .initcall.init : { *(.initcall1.init) diff --git a/arch/m32r/mm/ioremap.c b/arch/m32r/mm/ioremap.c index f1e859320c5d..1e629946dc3b 100644 --- a/arch/m32r/mm/ioremap.c +++ b/arch/m32r/mm/ioremap.c @@ -122,9 +122,9 @@ static int remap_area_pages(unsigned long address, unsigned long phys_addr, #define IS_LOW512(addr) (!((unsigned long)(addr) & ~0x1fffffffUL)) -void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) +void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) { - void * addr; + void __iomem * addr; struct vm_struct * area; unsigned long offset, last_addr; @@ -169,13 +169,13 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag if (!area) return NULL; area->phys_addr = phys_addr; - addr = area->addr; + addr = (void __iomem *) area->addr; if (remap_area_pages((unsigned long)addr, phys_addr, size, flags)) { - vunmap(addr); + vunmap((void __force *) addr); return NULL; } - return (void *) (offset + (char *)addr); + return (void __iomem *) (offset + (char __iomem *)addr); } #define IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == KSEG1) diff --git a/include/asm-m32r/resource.h b/include/asm-m32r/resource.h index db36222baf2a..69ece069a049 100644 --- a/include/asm-m32r/resource.h +++ b/include/asm-m32r/resource.h @@ -43,7 +43,7 @@ { RLIM_INFINITY, RLIM_INFINITY }, \ { 0, 0 }, \ { INR_OPEN, INR_OPEN }, \ - { RLIM_INFINITY, RLIM_INFINITY }, \ + { MLOCK_LIMIT, MLOCK_LIMIT }, \ { RLIM_INFINITY, RLIM_INFINITY }, \ { RLIM_INFINITY, RLIM_INFINITY }, \ { MAX_SIGPENDING, MAX_SIGPENDING }, \ diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h index 09e15566dbfd..159519d99042 100644 --- a/include/asm-m32r/socket.h +++ b/include/asm-m32r/socket.h @@ -1,10 +1,6 @@ #ifndef _ASM_M32R_SOCKET_H #define _ASM_M32R_SOCKET_H -/* $Id$ */ - -/* orig : i386 2.4.18 */ - #include <asm/sockios.h> /* For setsockoptions(2) */ @@ -51,20 +47,4 @@ #define SO_PEERSEC 31 -/* Nasty libc5 fixup - bletch */ -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) -/* Socket types. */ -#define SOCK_STREAM 1 /* stream (connection) socket */ -#define SOCK_DGRAM 2 /* datagram (conn.less) socket */ -#define SOCK_RAW 3 /* raw socket */ -#define SOCK_RDM 4 /* reliably-delivered message */ -#define SOCK_SEQPACKET 5 /* sequential packet socket */ -#define SOCK_PACKET 10 /* linux specific way of */ - /* getting packets at the dev */ - /* level. For writing rarp and */ - /* other similar things on the */ - /* user level. */ -#define SOCK_MAX (SOCK_PACKET+1) -#endif - #endif /* _ASM_M32R_SOCKET_H */ diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h index 9de3d42ba355..31aca939104f 100644 --- a/include/asm-m32r/unistd.h +++ b/include/asm-m32r/unistd.h @@ -292,15 +292,27 @@ #define __NR_mq_timedreceive (__NR_mq_open+3) #define __NR_mq_notify (__NR_mq_open+4) #define __NR_mq_getsetattr (__NR_mq_open+5) -#define __NR_kexec_load 283 +#define __NR_sys_kexec_load 283 +#define __NR_waitid 284 +#define __NR_perfctr_info 285 +#define __NR_vperfctr_open (__NR_perfctr_info+1) +#define __NR_vperfctr_control (__NR_perfctr_info+2) +#define __NR_vperfctr_unlink (__NR_perfctr_info+3) +#define __NR_vperfctr_iresume (__NR_perfctr_info+4) +#define __NR_vperfctr_read (__NR_perfctr_info+5) +#define __NR_add_key 291 +#define __NR_request_key 292 +#define __NR_keyctl 293 -#define NR_syscalls 284 +#define NR_syscalls 294 -/* user-visible error numbers are in the range -1 - -124: see <asm-m32r/errno.h> */ +/* user-visible error numbers are in the range -1 - -128: see + * <asm-m32r/errno.h> + */ #define __syscall_return(type, res) \ do { \ - if ((unsigned long)(res) >= (unsigned long)(-125)) { \ + if ((unsigned long)(res) >= (unsigned long)(-(128 + 1))) { \ /* Avoid using "res" which is declared to be in register r0; \ errno might expand to a function call and clobber it. */ \ int __err = -(res); \ |