diff options
| -rw-r--r-- | include/linux/ipc.h | 2 | ||||
| -rw-r--r-- | include/linux/msg.h | 4 | ||||
| -rw-r--r-- | include/linux/string.h | 2 | ||||
| -rw-r--r-- | kernel/exit.c | 1 | ||||
| -rw-r--r-- | kernel/sched.c | 1 | ||||
| -rw-r--r-- | mm/memory.c | 3 | ||||
| -rw-r--r-- | mm/slab.c | 1 |
7 files changed, 4 insertions, 10 deletions
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 88824df8a..10840cab1 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h @@ -3,7 +3,7 @@ #include <linux/types.h> -#define IPC_PRIVATE ((key_t) 0) +#define IPC_PRIVATE ((__kernel_key_t) 0) struct ipc_perm { diff --git a/include/linux/msg.h b/include/linux/msg.h index deda19265..d63a388ca 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h @@ -3,10 +3,6 @@ #include <linux/ipc.h> -/* ipcs ctl commands */ -#define MSG_STAT 11 -#define MSG_INFO 12 - /* msgrcv options */ #define MSG_NOERROR 010000 /* no error if message is too big */ #define MSG_EXCEPT 020000 /* recv any msg except of specified type.*/ diff --git a/include/linux/string.h b/include/linux/string.h index 4ec3291c4..214503c20 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -13,7 +13,7 @@ extern "C" { extern char * ___strtok; extern char * strcpy(char *,const char *); -extern char * strncpy(char *,const char *,__kernel_size_t); +extern char * strncpy(char *,const char *, __kernel_size_t); extern char * strcat(char *, const char *); extern char * strncat(char *, const char *, __kernel_size_t); extern char * strchr(const char *,int); diff --git a/kernel/exit.c b/kernel/exit.c index 9a725e9c8..afa3e5393 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -21,7 +21,6 @@ #include <linux/module.h> #include <linux/slab.h> -#include <asm/system.h> #include <asm/uaccess.h> #include <asm/pgtable.h> #include <asm/mmu_context.h> diff --git a/kernel/sched.c b/kernel/sched.c index 94662ddb3..5d35e45e0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -476,7 +476,6 @@ asmlinkage void schedule(void) timer.function = process_timeout; add_timer(&timer); } - get_mmu_context(next); switch_to(prev,next); diff --git a/mm/memory.c b/mm/memory.c index 81022e770..3e94fd1f3 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -810,9 +810,10 @@ static void do_no_page(struct task_struct * tsk, struct vm_area_struct * vma, anonymous_page: entry = pte_wrprotect(mk_pte(ZERO_PAGE, vma->vm_page_prot)); if (write_access) { - unsigned long page = get_free_page(GFP_KERNEL); + unsigned long page = __get_free_page(GFP_KERNEL); if (!page) goto sigbus; + clear_page(page); entry = pte_mkwrite(pte_mkdirty(mk_pte(page, vma->vm_page_prot))); vma->vm_mm->rss++; tsk->min_flt++; @@ -1649,7 +1649,6 @@ kfree(const void *objp) } null_ptr: printk(KERN_ERR "kfree: Bad obj %p\n", objp); -while(1); return; } |