diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /arch/sparc | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/config.in | 3 | ||||
| -rw-r--r-- | arch/sparc/defconfig | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/sys_sunos.c | 2 | ||||
| -rw-r--r-- | arch/sparc/mm/init.c | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/arch/sparc/config.in b/arch/sparc/config.in index 1fc89b977..1f485d4ca 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -72,9 +72,6 @@ bool 'Sysctl support' CONFIG_SYSCTL tristate 'Kernel support for a.out binaries' CONFIG_BINFMT_AOUT tristate 'Kernel support for ELF binaries' CONFIG_BINFMT_ELF tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC -if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then - tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA -fi endmenu mainmenu_option next_comment diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig index 1caf1143a..07985d46d 100644 --- a/arch/sparc/defconfig +++ b/arch/sparc/defconfig @@ -80,7 +80,6 @@ CONFIG_SYSCTL=y CONFIG_BINFMT_AOUT=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m -CONFIG_BINFMT_JAVA=m # # Floppy, IDE, and other block devices diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c index ed610942e..e8475ffeb 100644 --- a/arch/sparc/kernel/sys_sunos.c +++ b/arch/sparc/kernel/sys_sunos.c @@ -196,7 +196,7 @@ asmlinkage int sunos_brk(unsigned long brk) * simple, it hopefully works in most obvious cases.. Easy to * fool it, but this should catch most mistakes. */ - freepages = buffermem >> PAGE_SHIFT; + freepages = atomic_read(&buffermem) >> PAGE_SHIFT; freepages += atomic_read(&page_cache_size); freepages >>= 1; freepages += nr_free_pages; diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index dcec30bd1..871a48180 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c @@ -106,7 +106,6 @@ void show_mem(void) printk("%ld page tables cached\n",pgtable_cache_size); if (sparc_cpu_model == sun4m || sparc_cpu_model == sun4d) printk("%ld page dirs cached\n", pgd_cache_size); - show_buffers(); #ifdef CONFIG_NET show_net_buffers(); #endif @@ -363,7 +362,7 @@ void si_meminfo(struct sysinfo *val) val->totalram = 0; val->sharedram = 0; val->freeram = nr_free_pages << PAGE_SHIFT; - val->bufferram = buffermem; + val->bufferram = atomic_read(&buffermem); for (page = mem_map, end = mem_map + max_mapnr; page < end; page++) { if (PageSkip(page)) { |