diff options
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/bios32.c | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/process.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/kernel/bios32.c b/arch/m68k/kernel/bios32.c index c3b5dacba..d9cf9d9b8 100644 --- a/arch/m68k/kernel/bios32.c +++ b/arch/m68k/kernel/bios32.c @@ -26,7 +26,7 @@ */ #include <linux/pci.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/mm.h> #include <asm/io.h> diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 3e62e6fe1..fcb7b915c 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -140,7 +140,7 @@ SYMBOL_NAME_LABEL(ret_from_exception) bnes 2f | if so, skip resched, signals | only allow interrupts when we are really the last one on the | kernel stack, otherwise stack overflow can occur during - | heavy interupt load + | heavy interrupt load andw #ALLOWINT,%sr tstl %curptr@(TASK_NEEDRESCHED) jne SYMBOL_NAME(reschedule) diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 6934e4168..7fd40aaa4 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -20,7 +20,7 @@ #include <linux/stddef.h> #include <linux/unistd.h> #include <linux/ptrace.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/user.h> #include <linux/a.out.h> #include <linux/reboot.h> |