diff options
Diffstat (limited to 'arch/sparc64')
| -rw-r--r-- | arch/sparc64/config.in | 2 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/init_task.c | 1 | ||||
| -rw-r--r-- | arch/sparc64/kernel/traps.c | 6 | ||||
| -rw-r--r-- | arch/sparc64/mm/init.c | 15 |
5 files changed, 12 insertions, 14 deletions
diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in index 0bb079f4e..4461cdea0 100644 --- a/arch/sparc64/config.in +++ b/arch/sparc64/config.in @@ -14,7 +14,7 @@ comment 'Loadable module support' bool 'Enable loadable module support' CONFIG_MODULES if [ "$CONFIG_MODULES" = "y" ]; then bool 'Set version information on all symbols for modules' CONFIG_MODVERSIONS - bool 'Kernel daemon support (e.g. autoload of modules)' CONFIG_KERNELD + bool 'Kernel module loader' CONFIG_KMOD fi endmenu diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 7232deff2..f3c2e2ca4 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -12,7 +12,7 @@ CONFIG_EXPERIMENTAL=y # CONFIG_MODULES=y CONFIG_MODVERSIONS=y -CONFIG_KERNELD=y +CONFIG_KMOD=y # # General setup diff --git a/arch/sparc64/kernel/init_task.c b/arch/sparc64/kernel/init_task.c index d0fc09346..1829daeea 100644 --- a/arch/sparc64/kernel/init_task.c +++ b/arch/sparc64/kernel/init_task.c @@ -6,6 +6,7 @@ static struct vm_area_struct init_mmap = INIT_MMAP; static struct fs_struct init_fs = INIT_FS; +static struct files * init_fd_array[NR_OPEN] = { NULL, }; static struct files_struct init_files = INIT_FILES; static struct signal_struct init_signals = INIT_SIGNALS; struct mm_struct init_mm = INIT_MM; diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index cde799d92..6e1d30990 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c @@ -26,8 +26,8 @@ #include <asm/uaccess.h> #include <asm/fpumacro.h> #include <asm/lsu.h> -#ifdef CONFIG_KERNELD -#include <linux/kerneld.h> +#ifdef CONFIG_KMOD +#include <linux/kmod.h> #endif /* #define SYSCALL_TRACING */ @@ -327,7 +327,7 @@ void do_fpother(struct pt_regs *regs) case (2 << 14): /* unfinished_FPop */ case (3 << 14): /* unimplemented_FPop */ #ifdef CONFIG_MATHEMU_MODULE -#ifdef CONFIG_KERNELD +#ifdef CONFIG_KMOD if (!handle_mathemu) request_module("math-emu"); #endif diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index 54dc8f265..b564dc0dc 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c @@ -10,6 +10,7 @@ #include <linux/init.h> #include <linux/blk.h> #include <linux/swap.h> +#include <linux/swapctl.h> #include <asm/head.h> #include <asm/system.h> @@ -864,10 +865,6 @@ paging_init(unsigned long start_mem, unsigned long end_mem)) return device_scan (PAGE_ALIGN (start_mem)); } -extern int min_free_pages; -extern int free_pages_low; -extern int free_pages_high; - __initfunc(static void taint_real_pages(unsigned long start_mem, unsigned long end_mem)) { unsigned long addr, tmp2 = 0; @@ -946,11 +943,11 @@ __initfunc(void mem_init(unsigned long start_mem, unsigned long end_mem)) initpages << (PAGE_SHIFT-10), PAGE_OFFSET, end_mem); - min_free_pages = nr_free_pages >> 7; - if(min_free_pages < 16) - min_free_pages = 16; - free_pages_low = min_free_pages + (min_free_pages >> 1); - free_pages_high = min_free_pages + min_free_pages; + freepages.low = nr_free_pages >> 7; + if(freepages.low < 16) + freepages.low = 16; + freepages.low = freepages.low + (freepages.low >> 1); + freepages.high = freepages.low + freepages.low; } void free_initmem (void) |