From b63ad0882a16a5d28003e57f2b0b81dee3fb322b Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 28 Nov 2000 03:58:46 +0000 Subject: Merge with 2.4.0-test11. --- arch/sparc/config.in | 4 +++- arch/sparc/kernel/ebus.c | 24 +----------------------- arch/sparc/kernel/pcic.c | 19 +------------------ arch/sparc/kernel/semaphore.c | 6 +++--- arch/sparc/mm/init.c | 7 +++---- arch/sparc/mm/srmmu.c | 4 ++-- arch/sparc/mm/sun4c.c | 7 ++++--- arch/sparc/vmlinux.lds | 3 +++ 8 files changed, 20 insertions(+), 54 deletions(-) (limited to 'arch/sparc') diff --git a/arch/sparc/config.in b/arch/sparc/config.in index cb615fa0b..1a75cdf17 100644 --- a/arch/sparc/config.in +++ b/arch/sparc/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.104 2000/10/04 09:01:38 anton Exp $ +# $Id: config.in,v 1.105 2000/11/12 10:01:41 davem Exp $ # For a description of the syntax of this configuration file, # see Documentation/kbuild/config-language.txt. # @@ -31,6 +31,8 @@ bool 'Symmetric multi-processing support (does not work on sun4/sun4c)' CONFIG_S # Global things across all Sun machines. define_bool CONFIG_ISA n +define_bool CONFIG_EISA n +define_bool CONFIG_MCA n define_bool CONFIG_PCMCIA n define_bool CONFIG_SBUS y define_bool CONFIG_SBUSCHAR y diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index f61be9932..00c465b10 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c @@ -1,4 +1,4 @@ -/* $Id: ebus.c,v 1.11 2000/10/10 01:07:38 davem Exp $ +/* $Id: ebus.c,v 1.15 2000/11/08 05:06:21 davem Exp $ * ebus.c: PCI to EBus bridge device. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -24,18 +24,9 @@ struct linux_ebus *ebus_chain = 0; -#ifdef CONFIG_SUN_OPENPROMIO -extern int openprom_init(void); -#endif #ifdef CONFIG_SUN_AUXIO extern void auxio_probe(void); #endif -#ifdef CONFIG_OBP_FLASH -extern int flash_init(void); -#endif -#ifdef CONFIG_ENVCTRL -extern int envctrl_init(void); -#endif /* We are together with pcic.c under CONFIG_PCI. */ extern unsigned int pcic_pin_to_irq(unsigned int, char *name); @@ -367,20 +358,7 @@ void __init ebus_init(void) ++num_ebus; } -#ifdef CONFIG_SUN_OPENPROMIO - openprom_init(); -#endif - -#ifdef CONFIG_SUN_BPP - bpp_init(); -#endif #ifdef CONFIG_SUN_AUXIO auxio_probe(); #endif -#ifdef CONFIG_ENVCTRL - envctrl_init(); -#endif -#ifdef CONFIG_OBP_FLASH - flash_init(); -#endif } diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 028612687..e7b4e96de 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -1,4 +1,4 @@ -/* $Id: pcic.c,v 1.18 2000/09/25 06:09:12 anton Exp $ +/* $Id: pcic.c,v 1.19 2000/11/08 04:49:17 davem Exp $ * pcic.c: Sparc/PCI controller support * * Copyright (C) 1998 V. Roganov and G. Raiko @@ -866,23 +866,6 @@ void pcibios_update_resource(struct pci_dev *pdev, struct resource *res1, { } -#if 0 -void pcibios_update_irq(struct pci_dev *pdev, int irq) -{ -} - -unsigned long resource_fixup(struct pci_dev *pdev, struct resource *res, - unsigned long start, unsigned long size) -{ - return start; -} - -void pcibios_fixup_pbus_ranges(struct pci_bus *pbus, - struct pbus_set_ranges_data *pranges) -{ -} -#endif - void pcibios_align_resource(void *data, struct resource *res, unsigned long size) { } diff --git a/arch/sparc/kernel/semaphore.c b/arch/sparc/kernel/semaphore.c index 4359ec232..d6638be10 100644 --- a/arch/sparc/kernel/semaphore.c +++ b/arch/sparc/kernel/semaphore.c @@ -1,4 +1,4 @@ -/* $Id: semaphore.c,v 1.3 2000/10/14 10:09:00 davem Exp $ +/* $Id: semaphore.c,v 1.4 2000/11/10 04:02:03 davem Exp $ * Generic semaphore code. Buyer beware. Do your own * specific changes in */ @@ -166,7 +166,7 @@ void down_write_failed_biased(struct rw_semaphore *sem) for (;;) { if (!ldstub(&sem->write_not_granted)) break; - set_task_state(tsk, TASK_UNINTERRUPTIBLE | TASK_EXCLUSIVE); + set_task_state(tsk, TASK_UNINTERRUPTIBLE); if (sem->write_not_granted) schedule(); } @@ -216,7 +216,7 @@ void down_write_failed(struct rw_semaphore *sem) add_wait_queue_exclusive(&sem->wait, &wait); while (sem->count < 0) { - set_task_state(tsk, TASK_UNINTERRUPTIBLE | TASK_EXCLUSIVE); + set_task_state(tsk, TASK_UNINTERRUPTIBLE); if (sem->count >= 0) break; /* we must attempt to acquire or bias the lock */ schedule(); diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index 9cbbb1c9c..85161a3a6 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.94 2000/10/19 00:49:51 davem Exp $ +/* $Id: init.c,v 1.95 2000/11/10 04:49:56 davem Exp $ * linux/arch/sparc/mm/init.c * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -579,8 +579,7 @@ void si_meminfo(struct sysinfo *val) void flush_page_to_ram(struct page *page) { - unsigned long vaddr; - vaddr = kmap(page); - __flush_page_to_ram((unsigned long)page_address(page)); + unsigned long vaddr = (unsigned long) kmap(page); + __flush_page_to_ram(vaddr); kunmap(page); } diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index a91809d03..b32199c13 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -1,4 +1,4 @@ -/* $Id: srmmu.c,v 1.223 2000/10/16 14:32:49 anton Exp $ +/* $Id: srmmu.c,v 1.224 2000/11/09 22:40:05 davem Exp $ * srmmu.c: SRMMU specific routines for memory management. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -1163,7 +1163,7 @@ extern int linux_num_cpus; void (*poke_srmmu)(void) __initdata = NULL; -extern unsigned long bootmem_init(void); +extern void bootmem_init(void); extern void sun_serial_setup(void); void __init srmmu_paging_init(void) diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index a416ecf19..edba89672 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -1,4 +1,4 @@ -/* $Id: sun4c.c,v 1.200 2000/10/16 14:32:49 anton Exp $ +/* $Id: sun4c.c,v 1.201 2000/11/09 22:39:36 davem Exp $ * sun4c.c: Doing in software what should be done in hardware. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -2509,7 +2509,7 @@ void sun4c_update_mmu_cache(struct vm_area_struct *vma, unsigned long address, p extern void sparc_context_init(int); extern unsigned long end; -extern unsigned long bootmem_init(void); +extern void bootmem_init(void); extern unsigned long last_valid_pfn; extern void sun_serial_setup(void); @@ -2524,7 +2524,8 @@ void __init sun4c_paging_init(void) kernel_end += (SUN4C_REAL_PGDIR_SIZE * 4); kernel_end = SUN4C_REAL_PGDIR_ALIGN(kernel_end); - last_valid_pfn = end_pfn = bootmem_init(); + bootmem_init(); + end_pfn = last_valid_pfn; /* This does not logically belong here, but we need to * call it at the moment we are able to use the bootmem diff --git a/arch/sparc/vmlinux.lds b/arch/sparc/vmlinux.lds index bba19d4c5..e449e26fa 100644 --- a/arch/sparc/vmlinux.lds +++ b/arch/sparc/vmlinux.lds @@ -31,6 +31,9 @@ SECTIONS __start___ksymtab = .; __ksymtab : { *(__ksymtab) } __stop___ksymtab = .; + __start___kallsyms = .; /* All kernel symbols */ + __kallsyms : { *(__kallsyms) } + __stop___kallsyms = .; . = ALIGN(4096); __init_begin = .; -- cgit v1.2.3