From ac0799b1fead2984e823b66766fc67a68961f8d0 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 10 Jan 2006 21:57:40 +0100 Subject: [PATCH] --- yaml --- r: 17855 b: refs/heads/master c: ad2b2426bb8dce97827182946e33e7f7ff0afbce h: refs/heads/master i: 17853: 0440ef6e4e974aba49c917739c3bafb43e4011b2 17851: 2362582648b853802557eb571c47e8182e5224a0 17847: e8a75c8d7e68c480d7cc277f6b61643553b869a6 17839: b3b74e6386b4c21d915c0f41d7a2e378cafb28d6 17823: 5b9cce9f190a17082662455bf7f6d65bccf91904 17791: 5f7bd125d8db075d945bc4e4dfd6b133344c35b9 v: v3 --- [refs] | 2 +- trunk/Documentation/cpusets.txt | 4 +- trunk/Documentation/laptop-mode.txt | 6 +- trunk/MAINTAINERS | 2 +- trunk/arch/i386/boot/Makefile | 2 +- trunk/arch/i386/mm/pageattr.c | 2 +- trunk/arch/parisc/kernel/cache.c | 20 +-- trunk/arch/parisc/kernel/drivers.c | 13 +- trunk/arch/parisc/kernel/firmware.c | 2 +- trunk/arch/parisc/kernel/hardware.c | 1 - trunk/arch/parisc/kernel/inventory.c | 6 +- trunk/arch/parisc/kernel/pci-dma.c | 6 +- trunk/arch/parisc/kernel/pdc_chassis.c | 13 +- trunk/arch/parisc/kernel/perf.c | 6 +- trunk/arch/parisc/kernel/process.c | 2 +- trunk/arch/parisc/kernel/processor.c | 8 +- trunk/arch/parisc/kernel/setup.c | 10 +- trunk/arch/parisc/kernel/smp.c | 16 +-- trunk/arch/parisc/kernel/time.c | 4 +- trunk/arch/parisc/kernel/topology.c | 3 +- trunk/arch/parisc/kernel/unaligned.c | 2 +- trunk/arch/parisc/kernel/unwind.c | 2 +- trunk/arch/parisc/kernel/vmlinux.lds.S | 15 ++- trunk/arch/parisc/mm/init.c | 29 ++--- trunk/arch/parisc/mm/ioremap.c | 100 ++++++--------- trunk/arch/powerpc/configs/ppc64_defconfig | 2 +- trunk/drivers/net/gianfar_sysfs.c | 2 +- trunk/drivers/parisc/dino.c | 30 ++--- trunk/drivers/parisc/eisa.c | 4 +- trunk/drivers/parisc/eisa_eeprom.c | 2 +- trunk/drivers/parisc/lasi.c | 2 +- trunk/drivers/parisc/lba_pci.c | 115 ++++-------------- trunk/drivers/parisc/led.c | 18 +-- trunk/drivers/parisc/pdc_stable.c | 44 ++----- trunk/drivers/parisc/power.c | 12 +- trunk/drivers/parport/Kconfig | 1 - trunk/drivers/video/stifb.c | 65 +++++----- trunk/fs/afs/cmservice.c | 2 +- trunk/fs/attr.c | 1 + trunk/fs/binfmt_elf.c | 8 +- trunk/fs/ext2/dir.c | 2 +- trunk/fs/proc/vmcore.c | 1 + trunk/fs/xfs/xfs_iomap.c | 1 + trunk/include/asm-parisc/cache.h | 8 +- trunk/include/asm-parisc/io.h | 2 +- trunk/include/asm-parisc/page.h | 7 -- trunk/include/asm-parisc/pci.h | 8 +- trunk/include/asm-parisc/processor.h | 18 +-- trunk/include/asm-parisc/tlbflush.h | 1 - trunk/include/asm-powerpc/elf.h | 1 + trunk/include/linux/cache.h | 2 +- trunk/include/linux/mm.h | 2 +- trunk/include/linux/mutex-debug.h | 2 +- trunk/include/linux/mutex.h | 3 +- trunk/kernel/mutex-debug.c | 5 +- trunk/mm/page_alloc.c | 2 +- trunk/mm/slab.c | 2 +- trunk/mm/swapfile.c | 2 +- trunk/net/core/wireless.c | 1 - trunk/net/decnet/netfilter/dn_rtmsg.c | 2 + .../ipv4/netfilter/ip_conntrack_proto_icmp.c | 1 + .../ipv4/netfilter/ip_conntrack_proto_tcp.c | 1 + .../ipv4/netfilter/ip_conntrack_proto_udp.c | 1 + trunk/net/ipv6/Makefile | 3 +- trunk/net/ipv6/netfilter.c | 5 +- trunk/sound/oss/harmony.c | 4 +- 66 files changed, 264 insertions(+), 407 deletions(-) diff --git a/[refs] b/[refs] index 436005ffa25e..f8111ed30c20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4fc7ab1d065a9dd89ed0e74439ef87d4a16e980 +refs/heads/master: ad2b2426bb8dce97827182946e33e7f7ff0afbce diff --git a/trunk/Documentation/cpusets.txt b/trunk/Documentation/cpusets.txt index 990998ee10b6..9e49b1c35729 100644 --- a/trunk/Documentation/cpusets.txt +++ b/trunk/Documentation/cpusets.txt @@ -135,7 +135,7 @@ Cpusets extends these two mechanisms as follows: The implementation of cpusets requires a few, simple hooks into the rest of the kernel, none in performance critical paths: - - in init/main.c, to initialize the root cpuset at system boot. + - in main/init.c, to initialize the root cpuset at system boot. - in fork and exit, to attach and detach a task from its cpuset. - in sched_setaffinity, to mask the requested CPUs by what's allowed in that tasks cpuset. @@ -146,7 +146,7 @@ into the rest of the kernel, none in performance critical paths: and related changes in both sched.c and arch/ia64/kernel/domain.c - in the mbind and set_mempolicy system calls, to mask the requested Memory Nodes by what's allowed in that tasks cpuset. - - in page_alloc.c, to restrict memory to allowed nodes. + - in page_alloc, to restrict memory to allowed nodes. - in vmscan.c, to restrict page recovery to the current cpuset. In addition a new file system, of type "cpuset" may be mounted, diff --git a/trunk/Documentation/laptop-mode.txt b/trunk/Documentation/laptop-mode.txt index f42e4c089356..dc4e810afdcd 100644 --- a/trunk/Documentation/laptop-mode.txt +++ b/trunk/Documentation/laptop-mode.txt @@ -3,7 +3,7 @@ How to conserve battery power using laptop-mode Document Author: Bart Samwel (bart@samwel.tk) Date created: January 2, 2004 -Last modified: December 06, 2004 +Last modified: July 10, 2004 Introduction ------------ @@ -33,7 +33,7 @@ or anything. Simply install all the files included in this document, and laptop mode will automatically be started when you're on battery. For your convenience, a tarball containing an installer can be downloaded at: -http://www.xs4all.nl/~bsamwel/laptop_mode/tools/ +http://www.xs4all.nl/~bsamwel/laptop_mode/tools To configure laptop mode, you need to edit the configuration file, which is located in /etc/default/laptop-mode on Debian-based systems, or in @@ -912,7 +912,7 @@ void usage() exit(0); } -int main(int argc, char **argv) +int main(int ac, char **av) { int fd; char *disk = 0; diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b6416a293ec9..090e10b65b09 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2487,7 +2487,7 @@ P: Paul Mundt M: lethal@linux-sh.org P: Kazumoto Kojima M: kkojima@rr.iij4u.or.jp -L: linuxsh-dev@lists.sourceforge.net +L: linux-sh@m17n.org W: http://www.linux-sh.org W: http://www.m17n.org/linux-sh/ W: http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html diff --git a/trunk/arch/i386/boot/Makefile b/trunk/arch/i386/boot/Makefile index f136752563b1..0fea75dd4e31 100644 --- a/trunk/arch/i386/boot/Makefile +++ b/trunk/arch/i386/boot/Makefile @@ -101,4 +101,4 @@ zlilo: $(BOOTIMAGE) if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi install: - sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)" + sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)" diff --git a/trunk/arch/i386/mm/pageattr.c b/trunk/arch/i386/mm/pageattr.c index d0cadb33b54c..e8a53552b13d 100644 --- a/trunk/arch/i386/mm/pageattr.c +++ b/trunk/arch/i386/mm/pageattr.c @@ -224,7 +224,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable) return; if (!enable) mutex_debug_check_no_locks_freed(page_address(page), - numpages * PAGE_SIZE); + page_address(page+numpages)); /* the return value is ignored - the calls cannot fail, * large pages are disabled at boot time. diff --git a/trunk/arch/parisc/kernel/cache.c b/trunk/arch/parisc/kernel/cache.c index d8a4ca021aac..a065349aee37 100644 --- a/trunk/arch/parisc/kernel/cache.c +++ b/trunk/arch/parisc/kernel/cache.c @@ -29,9 +29,9 @@ #include #include -int split_tlb __read_mostly; -int dcache_stride __read_mostly; -int icache_stride __read_mostly; +int split_tlb; +int dcache_stride; +int icache_stride; EXPORT_SYMBOL(dcache_stride); @@ -45,29 +45,29 @@ DEFINE_SPINLOCK(pa_tlb_lock); EXPORT_SYMBOL(pa_tlb_lock); #endif -struct pdc_cache_info cache_info __read_mostly; +struct pdc_cache_info cache_info; #ifndef CONFIG_PA20 -static struct pdc_btlb_info btlb_info __read_mostly; +static struct pdc_btlb_info btlb_info; #endif #ifdef CONFIG_SMP void flush_data_cache(void) { - on_each_cpu(flush_data_cache_local, NULL, 1, 1); + on_each_cpu((void (*)(void *))flush_data_cache_local, NULL, 1, 1); } void flush_instruction_cache(void) { - on_each_cpu(flush_instruction_cache_local, NULL, 1, 1); + on_each_cpu((void (*)(void *))flush_instruction_cache_local, NULL, 1, 1); } #endif void flush_cache_all_local(void) { - flush_instruction_cache_local(NULL); - flush_data_cache_local(NULL); + flush_instruction_cache_local(); + flush_data_cache_local(); } EXPORT_SYMBOL(flush_cache_all_local); @@ -332,7 +332,7 @@ void clear_user_page_asm(void *page, unsigned long vaddr) } #define FLUSH_THRESHOLD 0x80000 /* 0.5MB */ -int parisc_cache_flush_threshold __read_mostly = FLUSH_THRESHOLD; +int parisc_cache_flush_threshold = FLUSH_THRESHOLD; void parisc_setup_cache_timing(void) { diff --git a/trunk/arch/parisc/kernel/drivers.c b/trunk/arch/parisc/kernel/drivers.c index 1eaa0d37f677..d016d672ec2b 100644 --- a/trunk/arch/parisc/kernel/drivers.c +++ b/trunk/arch/parisc/kernel/drivers.c @@ -39,7 +39,7 @@ #include /* See comments in include/asm-parisc/pci.h */ -struct hppa_dma_ops *hppa_dma_ops __read_mostly; +struct hppa_dma_ops *hppa_dma_ops; EXPORT_SYMBOL(hppa_dma_ops); static struct device root = { @@ -515,13 +515,8 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) (iodc_data[5] << 8) | iodc_data[6]; dev->hpa.name = parisc_pathname(dev); dev->hpa.start = hpa; - /* This is awkward. The STI spec says that gfx devices may occupy - * 32MB or 64MB. Unfortunately, we don't know how to tell whether - * it's the former or the latter. Assumptions either way can hurt us. - */ - if (hpa == 0xf4000000 || hpa == 0xf8000000) { - dev->hpa.end = hpa + 0x03ffffff; - } else if (hpa == 0xf6000000 || hpa == 0xfa000000) { + if (hpa == 0xf4000000 || hpa == 0xf6000000 || + hpa == 0xf8000000 || hpa == 0xfa000000) { dev->hpa.end = hpa + 0x01ffffff; } else { dev->hpa.end = hpa + 0xfff; @@ -839,7 +834,7 @@ static void print_parisc_device(struct parisc_device *dev) if (dev->num_addrs) { int k; - printk(", additional addresses: "); + printk(", additional addresses: "); for (k = 0; k < dev->num_addrs; k++) printk("0x%lx ", dev->addr[k]); } diff --git a/trunk/arch/parisc/kernel/firmware.c b/trunk/arch/parisc/kernel/firmware.c index 2dc06b8e1817..553f8fe03224 100644 --- a/trunk/arch/parisc/kernel/firmware.c +++ b/trunk/arch/parisc/kernel/firmware.c @@ -80,7 +80,7 @@ static unsigned long pdc_result2[32] __attribute__ ((aligned (8))); /* Firmware needs to be initially set to narrow to determine the * actual firmware width. */ -int parisc_narrow_firmware __read_mostly = 1; +int parisc_narrow_firmware = 1; #endif /* On most currently-supported platforms, IODC I/O calls are 32-bit calls diff --git a/trunk/arch/parisc/kernel/hardware.c b/trunk/arch/parisc/kernel/hardware.c index 3058bffd8a2c..2071b5bba15c 100644 --- a/trunk/arch/parisc/kernel/hardware.c +++ b/trunk/arch/parisc/kernel/hardware.c @@ -551,7 +551,6 @@ static struct hp_hardware hp_hardware_list[] __initdata = { {HPHW_BCPORT, 0x804, 0x0000C, 0x10, "REO I/O BC Merced Port"}, {HPHW_BCPORT, 0x782, 0x0000C, 0x00, "REO I/O BC Ropes Port"}, {HPHW_BCPORT, 0x784, 0x0000C, 0x00, "Pluto I/O BC Ropes Port"}, - {HPHW_BRIDGE, 0x05D, 0x0000A, 0x00, "SummitHawk Dino PCI Bridge"}, {HPHW_BRIDGE, 0x680, 0x0000A, 0x00, "Dino PCI Bridge"}, {HPHW_BRIDGE, 0x682, 0x0000A, 0x00, "Cujo PCI Bridge"}, {HPHW_BRIDGE, 0x782, 0x0000A, 0x00, "Elroy PCI Bridge"}, diff --git a/trunk/arch/parisc/kernel/inventory.c b/trunk/arch/parisc/kernel/inventory.c index 4e847ba53180..8f563871e83c 100644 --- a/trunk/arch/parisc/kernel/inventory.c +++ b/trunk/arch/parisc/kernel/inventory.c @@ -38,7 +38,7 @@ */ #undef DEBUG_PAT -int pdc_type __read_mostly = PDC_TYPE_ILLEGAL; +int pdc_type = PDC_TYPE_ILLEGAL; void __init setup_pdc(void) { @@ -120,8 +120,8 @@ set_pmem_entry(physmem_range_t *pmem_ptr, unsigned long start, * pdc info is bad in this case). */ - if (unlikely( ((start & (PAGE_SIZE - 1)) != 0) - || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) )) { + if ( ((start & (PAGE_SIZE - 1)) != 0) + || ((pages4k & ((1UL << PDC_PAGE_ADJ_SHIFT) - 1)) != 0) ) { panic("Memory range doesn't align with page size!\n"); } diff --git a/trunk/arch/parisc/kernel/pci-dma.c b/trunk/arch/parisc/kernel/pci-dma.c index a6caf1073085..f94a02ef3d95 100644 --- a/trunk/arch/parisc/kernel/pci-dma.c +++ b/trunk/arch/parisc/kernel/pci-dma.c @@ -33,10 +33,10 @@ #include #include /* for purge_tlb_*() macros */ -static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL; +static struct proc_dir_entry * proc_gsc_root = NULL; static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length); -static unsigned long pcxl_used_bytes __read_mostly = 0; -static unsigned long pcxl_used_pages __read_mostly = 0; +static unsigned long pcxl_used_bytes = 0; +static unsigned long pcxl_used_pages = 0; extern unsigned long pcxl_dma_start; /* Start of pcxl dma mapping area */ static spinlock_t pcxl_res_lock; diff --git a/trunk/arch/parisc/kernel/pdc_chassis.c b/trunk/arch/parisc/kernel/pdc_chassis.c index 2a01fe1bdc98..52004ae28d20 100644 --- a/trunk/arch/parisc/kernel/pdc_chassis.c +++ b/trunk/arch/parisc/kernel/pdc_chassis.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -39,8 +38,8 @@ #ifdef CONFIG_PDC_CHASSIS -static int pdc_chassis_old __read_mostly = 0; -static unsigned int pdc_chassis_enabled __read_mostly = 1; +static int pdc_chassis_old = 0; +static unsigned int pdc_chassis_enabled = 1; /** @@ -133,7 +132,7 @@ void __init parisc_pdc_chassis_init(void) { #ifdef CONFIG_PDC_CHASSIS int handle = 0; - if (likely(pdc_chassis_enabled)) { + if (pdc_chassis_enabled) { DPRINTK(KERN_DEBUG "%s: parisc_pdc_chassis_init()\n", __FILE__); /* Let see if we have something to handle... */ @@ -143,7 +142,7 @@ void __init parisc_pdc_chassis_init(void) printk(KERN_INFO "Enabling PDC_PAT chassis codes support.\n"); handle = 1; } - else if (unlikely(pdc_chassis_old)) { + else if (pdc_chassis_old) { printk(KERN_INFO "Enabling old style chassis LED panel support.\n"); handle = 1; } @@ -179,7 +178,7 @@ int pdc_chassis_send_status(int message) /* Maybe we should do that in an other way ? */ int retval = 0; #ifdef CONFIG_PDC_CHASSIS - if (likely(pdc_chassis_enabled)) { + if (pdc_chassis_enabled) { DPRINTK(KERN_DEBUG "%s: pdc_chassis_send_status(%d)\n", __FILE__, message); @@ -215,7 +214,7 @@ int pdc_chassis_send_status(int message) } } else retval = -1; #else - if (unlikely(pdc_chassis_old)) { + if (pdc_chassis_old) { switch (message) { case PDC_CHASSIS_DIRECT_BSTART: case PDC_CHASSIS_DIRECT_BCOMPLETE: diff --git a/trunk/arch/parisc/kernel/perf.c b/trunk/arch/parisc/kernel/perf.c index 79dcbcccecb8..f6fec62b6a2f 100644 --- a/trunk/arch/parisc/kernel/perf.c +++ b/trunk/arch/parisc/kernel/perf.c @@ -66,10 +66,10 @@ struct rdr_tbl_ent { uint8_t write_control; }; -static int perf_processor_interface __read_mostly = UNKNOWN_INTF; -static int perf_enabled __read_mostly = 0; +static int perf_processor_interface = UNKNOWN_INTF; +static int perf_enabled = 0; static spinlock_t perf_lock; -struct parisc_device *cpu_device __read_mostly = NULL; +struct parisc_device *cpu_device = NULL; /* RDRs to write for PCX-W */ static int perf_rdrs_W[] = diff --git a/trunk/arch/parisc/kernel/process.c b/trunk/arch/parisc/kernel/process.c index 4eb70a40ec7e..fee4f1f09adc 100644 --- a/trunk/arch/parisc/kernel/process.c +++ b/trunk/arch/parisc/kernel/process.c @@ -54,7 +54,7 @@ #include #include -static int hlt_counter __read_mostly; +static int hlt_counter; /* * Power off function, if any diff --git a/trunk/arch/parisc/kernel/processor.c b/trunk/arch/parisc/kernel/processor.c index 6df9f62cecb5..4f5bbcf1f5a4 100644 --- a/trunk/arch/parisc/kernel/processor.c +++ b/trunk/arch/parisc/kernel/processor.c @@ -44,10 +44,10 @@ #include /* for struct irq_region */ #include -struct system_cpuinfo_parisc boot_cpu_data __read_mostly; +struct system_cpuinfo_parisc boot_cpu_data; EXPORT_SYMBOL(boot_cpu_data); -struct cpuinfo_parisc cpu_data[NR_CPUS] __read_mostly; +struct cpuinfo_parisc cpu_data[NR_CPUS]; /* ** PARISC CPU driver - claim "device" and initialize CPU data structures. @@ -378,12 +378,12 @@ show_cpuinfo (struct seq_file *m, void *v) return 0; } -static struct parisc_device_id processor_tbl[] __read_mostly = { +static struct parisc_device_id processor_tbl[] = { { HPHW_NPROC, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, SVERSION_ANY_ID }, { 0, } }; -static struct parisc_driver cpu_driver __read_mostly = { +static struct parisc_driver cpu_driver = { .name = "CPU", .id_table = processor_tbl, .probe = processor_probe diff --git a/trunk/arch/parisc/kernel/setup.c b/trunk/arch/parisc/kernel/setup.c index 4a36ec3f6ac1..73e9c34b0948 100644 --- a/trunk/arch/parisc/kernel/setup.c +++ b/trunk/arch/parisc/kernel/setup.c @@ -46,15 +46,15 @@ #include #include -char command_line[COMMAND_LINE_SIZE] __read_mostly; +char command_line[COMMAND_LINE_SIZE]; /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */ -struct proc_dir_entry * proc_runway_root __read_mostly = NULL; -struct proc_dir_entry * proc_gsc_root __read_mostly = NULL; -struct proc_dir_entry * proc_mckinley_root __read_mostly = NULL; +struct proc_dir_entry * proc_runway_root = NULL; +struct proc_dir_entry * proc_gsc_root = NULL; +struct proc_dir_entry * proc_mckinley_root = NULL; #if !defined(CONFIG_PA20) && (defined(CONFIG_IOMMU_CCIO) || defined(CONFIG_IOMMU_SBA)) -int parisc_bus_is_phys __read_mostly = 1; /* Assume no IOMMU is present */ +int parisc_bus_is_phys = 1; /* Assume no IOMMU is present */ EXPORT_SYMBOL(parisc_bus_is_phys); #endif diff --git a/trunk/arch/parisc/kernel/smp.c b/trunk/arch/parisc/kernel/smp.c index 17f23c26f1ca..ce89da0f654d 100644 --- a/trunk/arch/parisc/kernel/smp.c +++ b/trunk/arch/parisc/kernel/smp.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include /* for flush_tlb_all() proto/macro */ #include #include /* for CPU_IRQ_REGION and friends */ @@ -58,9 +58,9 @@ DEFINE_SPINLOCK(smp_lock); volatile struct task_struct *smp_init_current_idle_task; -static volatile int cpu_now_booting __read_mostly = 0; /* track which CPU is booting */ +static volatile int cpu_now_booting = 0; /* track which CPU is booting */ -static int parisc_max_cpus __read_mostly = 1; +static int parisc_max_cpus = 1; /* online cpus are ones that we've managed to bring up completely * possible cpus are all valid cpu @@ -71,8 +71,8 @@ static int parisc_max_cpus __read_mostly = 1; * empty in the beginning. */ -cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; /* Bitmap of online CPUs */ -cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL; /* Bitmap of Present CPUs */ +cpumask_t cpu_online_map = CPU_MASK_NONE; /* Bitmap of online CPUs */ +cpumask_t cpu_possible_map = CPU_MASK_ALL; /* Bitmap of Present CPUs */ EXPORT_SYMBOL(cpu_online_map); EXPORT_SYMBOL(cpu_possible_map); @@ -406,10 +406,12 @@ EXPORT_SYMBOL(smp_call_function); * as we want to ensure all TLB's flushed before proceeding. */ +extern void flush_tlb_all_local(void); + void smp_flush_tlb_all(void) { - on_each_cpu(flush_tlb_all_local, NULL, 1, 1); + on_each_cpu((void (*)(void *))flush_tlb_all_local, NULL, 1, 1); } @@ -485,7 +487,7 @@ void __init smp_callin(void) #endif flush_cache_all_local(); /* start with known state */ - flush_tlb_all_local(NULL); + flush_tlb_all_local(); local_irq_enable(); /* Interrupts have been off until now */ diff --git a/trunk/arch/parisc/kernel/time.c b/trunk/arch/parisc/kernel/time.c index 594930bc4bcf..cded25680787 100644 --- a/trunk/arch/parisc/kernel/time.c +++ b/trunk/arch/parisc/kernel/time.c @@ -36,8 +36,8 @@ /* xtime and wall_jiffies keep wall-clock time */ extern unsigned long wall_jiffies; -static long clocktick __read_mostly; /* timer cycles per tick */ -static long halftick __read_mostly; +static long clocktick; /* timer cycles per tick */ +static long halftick; #ifdef CONFIG_SMP extern void smp_do_timer(struct pt_regs *regs); diff --git a/trunk/arch/parisc/kernel/topology.c b/trunk/arch/parisc/kernel/topology.c index 3ba040050e4c..ac2a40681414 100644 --- a/trunk/arch/parisc/kernel/topology.c +++ b/trunk/arch/parisc/kernel/topology.c @@ -20,9 +20,8 @@ #include #include #include -#include -static struct cpu cpu_devices[NR_CPUS] __read_mostly; +static struct cpu cpu_devices[NR_CPUS]; static int __init topology_init(void) { diff --git a/trunk/arch/parisc/kernel/unaligned.c b/trunk/arch/parisc/kernel/unaligned.c index de0a1b21cb40..eaae8a021f9f 100644 --- a/trunk/arch/parisc/kernel/unaligned.c +++ b/trunk/arch/parisc/kernel/unaligned.c @@ -122,7 +122,7 @@ #define ERR_NOTHANDLED -1 #define ERR_PAGEFAULT -2 -int unaligned_enabled __read_mostly = 1; +int unaligned_enabled = 1; void die_if_kernel (char *str, struct pt_regs *regs, long err); diff --git a/trunk/arch/parisc/kernel/unwind.c b/trunk/arch/parisc/kernel/unwind.c index cc1c1afc3187..db141108412e 100644 --- a/trunk/arch/parisc/kernel/unwind.c +++ b/trunk/arch/parisc/kernel/unwind.c @@ -35,7 +35,7 @@ static spinlock_t unwind_lock; * we can call unwind_init as early in the bootup process as * possible (before the slab allocator is initialized) */ -static struct unwind_table kernel_unwind_table __read_mostly; +static struct unwind_table kernel_unwind_table; static LIST_HEAD(unwind_tables); static inline const struct unwind_table_entry * diff --git a/trunk/arch/parisc/kernel/vmlinux.lds.S b/trunk/arch/parisc/kernel/vmlinux.lds.S index 6d6436a6b624..e5fac3e08c7a 100644 --- a/trunk/arch/parisc/kernel/vmlinux.lds.S +++ b/trunk/arch/parisc/kernel/vmlinux.lds.S @@ -68,7 +68,7 @@ SECTIONS RODATA /* writeable */ - . = ALIGN(4096); /* Make sure this is page aligned so + . = ALIGN(4096); /* Make sure this is paged aligned so that we can properly leave these as writable */ data_start = .; @@ -105,10 +105,6 @@ SECTIONS . = ALIGN(16); .data.lock_aligned : { *(.data.lock_aligned) } - /* rarely changed data like cpu maps */ - . = ALIGN(16); - .data.read_mostly : { *(.data.read_mostly) } - _edata = .; /* End of data section */ . = ALIGN(16384); /* init_task */ @@ -198,7 +194,14 @@ SECTIONS #endif } - STABS_DEBUG + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } .note 0 : { *(.note) } } diff --git a/trunk/arch/parisc/mm/init.c b/trunk/arch/parisc/mm/init.c index 720287d46e55..29b998e430e6 100644 --- a/trunk/arch/parisc/mm/init.c +++ b/trunk/arch/parisc/mm/init.c @@ -36,9 +36,9 @@ extern char _end; /* end of BSS, defined by linker */ extern char __init_begin, __init_end; #ifdef CONFIG_DISCONTIGMEM -struct node_map_data node_data[MAX_NUMNODES] __read_mostly; -bootmem_data_t bmem_data[MAX_NUMNODES] __read_mostly; -unsigned char pfnnid_map[PFNNID_MAP_MAX] __read_mostly; +struct node_map_data node_data[MAX_NUMNODES]; +bootmem_data_t bmem_data[MAX_NUMNODES]; +unsigned char pfnnid_map[PFNNID_MAP_MAX]; #endif static struct resource data_resource = { @@ -58,14 +58,14 @@ static struct resource pdcdata_resource = { .flags = IORESOURCE_BUSY | IORESOURCE_MEM, }; -static struct resource sysram_resources[MAX_PHYSMEM_RANGES] __read_mostly; +static struct resource sysram_resources[MAX_PHYSMEM_RANGES]; /* The following array is initialized from the firmware specific * information retrieved in kernel/inventory.c. */ -physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES] __read_mostly; -int npmem_ranges __read_mostly; +physmem_range_t pmem_ranges[MAX_PHYSMEM_RANGES]; +int npmem_ranges; #ifdef __LP64__ #define MAX_MEM (~0UL) @@ -73,7 +73,7 @@ int npmem_ranges __read_mostly; #define MAX_MEM (3584U*1024U*1024U) #endif /* !__LP64__ */ -static unsigned long mem_limit __read_mostly = MAX_MEM; +static unsigned long mem_limit = MAX_MEM; static void __init mem_limit_func(void) { @@ -300,13 +300,6 @@ static void __init setup_bootmem(void) max_pfn = start_pfn + npages; } - /* IOMMU is always used to access "high mem" on those boxes - * that can support enough mem that a PCI device couldn't - * directly DMA to any physical addresses. - * ISA DMA support will need to revisit this. - */ - max_low_pfn = max_pfn; - if ((bootmap_pfn - bootmap_start_pfn) != bootmap_pages) { printk(KERN_WARNING "WARNING! bootmap sizing is messed up!\n"); BUG(); @@ -438,11 +431,11 @@ void free_initmem(void) #define SET_MAP_OFFSET(x) ((void *)(((unsigned long)(x) + VM_MAP_OFFSET) \ & ~(VM_MAP_OFFSET-1))) -void *vmalloc_start __read_mostly; +void *vmalloc_start; EXPORT_SYMBOL(vmalloc_start); #ifdef CONFIG_PA11 -unsigned long pcxl_dma_start __read_mostly; +unsigned long pcxl_dma_start; #endif void __init mem_init(void) @@ -482,7 +475,7 @@ int do_check_pgt_cache(int low, int high) return 0; } -unsigned long *empty_zero_page __read_mostly; +unsigned long *empty_zero_page; void show_mem(void) { @@ -1005,7 +998,7 @@ void flush_tlb_all(void) void flush_tlb_all(void) { spin_lock(&sid_lock); - flush_tlb_all_local(NULL); + flush_tlb_all_local(); recycle_sids(); spin_unlock(&sid_lock); } diff --git a/trunk/arch/parisc/mm/ioremap.c b/trunk/arch/parisc/mm/ioremap.c index edd9a9559cba..5c7a1b3b9326 100644 --- a/trunk/arch/parisc/mm/ioremap.c +++ b/trunk/arch/parisc/mm/ioremap.c @@ -1,9 +1,12 @@ /* * arch/parisc/mm/ioremap.c * + * Re-map IO memory to kernel address space so that we can access it. + * This is needed for high PCI addresses that aren't mapped in the + * 640k-1MB IO memory area on PC's + * * (C) Copyright 1995 1996 Linus Torvalds * (C) Copyright 2001 Helge Deller - * (C) Copyright 2005 Kyle McMartin */ #include @@ -11,107 +14,81 @@ #include #include #include -#include -#include -static inline void -remap_area_pte(pte_t *pte, unsigned long address, unsigned long size, - unsigned long phys_addr, unsigned long flags) +static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size, + unsigned long phys_addr, unsigned long flags) { - unsigned long end, pfn; - pgprot_t pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | - _PAGE_ACCESSED | flags); + unsigned long end; address &= ~PMD_MASK; - end = address + size; if (end > PMD_SIZE) end = PMD_SIZE; - - BUG_ON(address >= end); - - pfn = phys_addr >> PAGE_SHIFT; + if (address >= end) + BUG(); do { - BUG_ON(!pte_none(*pte)); - - set_pte(pte, pfn_pte(pfn, pgprot)); - + if (!pte_none(*pte)) { + printk(KERN_ERR "remap_area_pte: page already exists\n"); + BUG(); + } + set_pte(pte, mk_pte_phys(phys_addr, __pgprot(_PAGE_PRESENT | _PAGE_RW | + _PAGE_DIRTY | _PAGE_ACCESSED | flags))); address += PAGE_SIZE; - pfn++; + phys_addr += PAGE_SIZE; pte++; } while (address && (address < end)); } -static inline int -remap_area_pmd(pmd_t *pmd, unsigned long address, unsigned long size, - unsigned long phys_addr, unsigned long flags) +static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size, + unsigned long phys_addr, unsigned long flags) { unsigned long end; address &= ~PGDIR_MASK; - end = address + size; if (end > PGDIR_SIZE) end = PGDIR_SIZE; - - BUG_ON(address >= end); - phys_addr -= address; + if (address >= end) + BUG(); do { - pte_t *pte = pte_alloc_kernel(pmd, address); + pte_t * pte = pte_alloc_kernel(pmd, address); if (!pte) return -ENOMEM; - - remap_area_pte(pte, address, end - address, - address + phys_addr, flags); - + remap_area_pte(pte, address, end - address, address + phys_addr, flags); address = (address + PMD_SIZE) & PMD_MASK; pmd++; } while (address && (address < end)); - return 0; } -#if USE_HPPA_IOREMAP -static int -remap_area_pages(unsigned long address, unsigned long phys_addr, - unsigned long size, unsigned long flags) +#if (USE_HPPA_IOREMAP) +static int remap_area_pages(unsigned long address, unsigned long phys_addr, + unsigned long size, unsigned long flags) { - pgd_t *dir; - int error = 0; + int error; + pgd_t * dir; unsigned long end = address + size; - BUG_ON(address >= end); - phys_addr -= address; - dir = pgd_offset_k(address); - + dir = pgd_offset(&init_mm, address); flush_cache_all(); - + if (address >= end) + BUG(); do { - pud_t *pud; pmd_t *pmd; - + pmd = pmd_alloc(&init_mm, dir, address); error = -ENOMEM; - pud = pud_alloc(&init_mm, dir, address); - if (!pud) - break; - - pmd = pmd_alloc(&init_mm, pud, address); if (!pmd) break; - if (remap_area_pmd(pmd, address, end - address, - phys_addr + address, flags)) + phys_addr + address, flags)) break; - error = 0; address = (address + PGDIR_SIZE) & PGDIR_MASK; dir++; } while (address && (address < end)); - flush_tlb_all(); - return error; } #endif /* USE_HPPA_IOREMAP */ @@ -146,7 +123,8 @@ EXPORT_SYMBOL(__raw_bad_addr); /* * Remap an arbitrary physical address space into the kernel virtual - * address space. + * address space. Needed when the kernel wants to access high addresses + * directly. * * NOTE! We need to allow non-page-aligned mappings too: we will obviously * have to convert them into an offset in a page-aligned mapping, but the @@ -170,8 +148,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l #endif #else - void *addr; - struct vm_struct *area; + void * addr; + struct vm_struct * area; unsigned long offset, last_addr; /* Don't allow wraparound or zero size */ @@ -189,11 +167,9 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l t_addr = __va(phys_addr); t_end = t_addr + (size - 1); - for (page = virt_to_page(t_addr); - page <= virt_to_page(t_end); page++) { + for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++) if(!PageReserved(page)) return NULL; - } } /* @@ -209,13 +185,11 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l area = get_vm_area(size, VM_IOREMAP); if (!area) return NULL; - addr = area->addr; if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) { vfree(addr); return NULL; } - return (void __iomem *) (offset + (char *)addr); #endif } diff --git a/trunk/arch/powerpc/configs/ppc64_defconfig b/trunk/arch/powerpc/configs/ppc64_defconfig index 347f4391db8d..0b2b55a79c3c 100644 --- a/trunk/arch/powerpc/configs/ppc64_defconfig +++ b/trunk/arch/powerpc/configs/ppc64_defconfig @@ -878,7 +878,7 @@ CONFIG_HVCS=m # # CONFIG_WATCHDOG is not set # CONFIG_RTC is not set -# CONFIG_GEN_RTC is not set +CONFIG_GEN_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set diff --git a/trunk/drivers/net/gianfar_sysfs.c b/trunk/drivers/net/gianfar_sysfs.c index 51ef181b1368..10d34cb19192 100644 --- a/trunk/drivers/net/gianfar_sysfs.c +++ b/trunk/drivers/net/gianfar_sysfs.c @@ -7,7 +7,7 @@ * Based on 8260_io/fcc_enet.c * * Author: Andy Fleming - * Maintainer: Kumar Gala (galak@kernel.crashing.org) + * Maintainer: Kumar Gala (kumar.gala@freescale.com) * * Copyright (c) 2002-2005 Freescale Semiconductor, Inc. * diff --git a/trunk/drivers/parisc/dino.c b/trunk/drivers/parisc/dino.c index 216d1d859326..5ab75334c579 100644 --- a/trunk/drivers/parisc/dino.c +++ b/trunk/drivers/parisc/dino.c @@ -83,8 +83,7 @@ ** bus number for each dino. */ -#define is_card_dino(id) ((id)->hw_type == HPHW_A_DMA) -#define is_cujo(id) ((id)->hversion == 0x682) +#define is_card_dino(id) ((id)->hw_type == HPHW_A_DMA) #define DINO_IAR0 0x004 #define DINO_IODC_ADDR 0x008 @@ -125,7 +124,6 @@ #define DINO_IRQS 11 /* bits 0-10 are architected */ #define DINO_IRR_MASK 0x5ff /* only 10 bits are implemented */ -#define DINO_LOCAL_IRQS (DINO_IRQS+1) #define DINO_MASK_IRQ(x) (1<<(x)) @@ -148,7 +146,7 @@ struct dino_device unsigned long txn_addr; /* EIR addr to generate interrupt */ u32 txn_data; /* EIR data assign to each dino */ u32 imr; /* IRQ's which are enabled */ - int global_irq[DINO_LOCAL_IRQS]; /* map IMR bit to global irq */ + int global_irq[12]; /* map IMR bit to global irq */ #ifdef DINO_DEBUG unsigned int dino_irr0; /* save most recent IRQ line stat */ #endif @@ -299,7 +297,7 @@ struct pci_port_ops dino_port_ops = { static void dino_disable_irq(unsigned int irq) { struct dino_device *dino_dev = irq_desc[irq].handler_data; - int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); + int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, irq); DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq); @@ -311,7 +309,7 @@ static void dino_disable_irq(unsigned int irq) static void dino_enable_irq(unsigned int irq) { struct dino_device *dino_dev = irq_desc[irq].handler_data; - int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); + int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, irq); u32 tmp; DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq); @@ -437,21 +435,6 @@ static void dino_choose_irq(struct parisc_device *dev, void *ctrl) dino_assign_irq(dino, irq, &dev->irq); } - -/* - * Cirrus 6832 Cardbus reports wrong irq on RDI Tadpole PARISC Laptop (deller@gmx.de) - * (the irqs are off-by-one, not sure yet if this is a cirrus, dino-hardware or dino-driver problem...) - */ -static void __devinit quirk_cirrus_cardbus(struct pci_dev *dev) -{ - u8 new_irq = dev->irq - 1; - printk(KERN_INFO "PCI: Cirrus Cardbus IRQ fixup for %s, from %d to %d\n", - pci_name(dev), dev->irq, new_irq); - dev->irq = new_irq; -} -DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_CIRRUS, PCI_DEVICE_ID_CIRRUS_6832, quirk_cirrus_cardbus ); - - static void __init dino_bios_init(void) { @@ -683,6 +666,7 @@ dino_fixup_bus(struct pci_bus *bus) printk(KERN_WARNING "Device %s has unassigned IRQ\n", pci_name(dev)); #endif } else { + /* Adjust INT_LINE for that busses region */ dino_assign_irq(dino_dev, dev->irq, &dev->irq); } @@ -888,7 +872,7 @@ static int __init dino_common_init(struct parisc_device *dev, /* allocate I/O Port resource region */ res = &dino_dev->hba.io_space; - if (!is_cujo(&dev->id)) { + if (dev->id.hversion == 0x680 || is_card_dino(&dev->id)) { res->name = "Dino I/O Port"; } else { res->name = "Cujo I/O Port"; @@ -943,7 +927,7 @@ static int __init dino_probe(struct parisc_device *dev) if (is_card_dino(&dev->id)) { version = "3.x (card mode)"; } else { - if (!is_cujo(&dev->id)) { + if(dev->id.hversion == 0x680) { if (dev->id.hversion_rev < 4) { version = dino_vers[dev->id.hversion_rev]; } diff --git a/trunk/drivers/parisc/eisa.c b/trunk/drivers/parisc/eisa.c index 3d94d86c1c9f..6362bf99eff6 100644 --- a/trunk/drivers/parisc/eisa.c +++ b/trunk/drivers/parisc/eisa.c @@ -57,7 +57,7 @@ static DEFINE_SPINLOCK(eisa_irq_lock); -void __iomem *eisa_eeprom_addr __read_mostly; +void __iomem *eisa_eeprom_addr; /* We can only have one EISA adapter in the system because neither * implementation can be flexed. @@ -141,7 +141,7 @@ static int slave_mask; * in the furure. */ /* irq 13,8,2,1,0 must be edge */ -static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered */ +static unsigned int eisa_irq_level; /* default to edge triggered */ /* called by free irq */ diff --git a/trunk/drivers/parisc/eisa_eeprom.c b/trunk/drivers/parisc/eisa_eeprom.c index e13aafa70bf5..3a1b4826e5c1 100644 --- a/trunk/drivers/parisc/eisa_eeprom.c +++ b/trunk/drivers/parisc/eisa_eeprom.c @@ -48,7 +48,7 @@ static loff_t eisa_eeprom_llseek(struct file *file, loff_t offset, int origin ) } static ssize_t eisa_eeprom_read(struct file * file, - char __user *buf, size_t count, loff_t *ppos ) + char *buf, size_t count, loff_t *ppos ) { unsigned char *tmp; ssize_t ret; diff --git a/trunk/drivers/parisc/lasi.c b/trunk/drivers/parisc/lasi.c index 2b3ba1dcf332..a8c20396ffbe 100644 --- a/trunk/drivers/parisc/lasi.c +++ b/trunk/drivers/parisc/lasi.c @@ -150,7 +150,7 @@ void __init lasi_led_init(unsigned long lasi_hpa) * */ -static unsigned long lasi_power_off_hpa __read_mostly; +static unsigned long lasi_power_off_hpa; static void lasi_power_off(void) { diff --git a/trunk/drivers/parisc/lba_pci.c b/trunk/drivers/parisc/lba_pci.c index cbae8c8963fa..5e495dcbc58a 100644 --- a/trunk/drivers/parisc/lba_pci.c +++ b/trunk/drivers/parisc/lba_pci.c @@ -167,7 +167,7 @@ /* non-postable I/O port space, densely packed */ #define LBA_PORT_BASE (PCI_F_EXTEND | 0xfee00000UL) -static void __iomem *astro_iop_base __read_mostly; +static void __iomem *astro_iop_base; #define ELROY_HVERS 0x782 #define MERCURY_HVERS 0x783 @@ -695,71 +695,11 @@ lba_claim_dev_resources(struct pci_dev *dev) } } } - - -/* - * truncate_pat_collision: Deal with overlaps or outright collisions - * between PAT PDC reported ranges. - * - * Broken PA8800 firmware will report lmmio range that - * overlaps with CPU HPA. Just truncate the lmmio range. - * - * BEWARE: conflicts with this lmmio range may be an - * elmmio range which is pointing down another rope. - * - * FIXME: only deals with one collision per range...theoretically we - * could have several. Supporting more than one collision will get messy. - */ -static unsigned long -truncate_pat_collision(struct resource *root, struct resource *new) -{ - unsigned long start = new->start; - unsigned long end = new->end; - struct resource *tmp = root->child; - - if (end <= start || start < root->start || !tmp) - return 0; - - /* find first overlap */ - while (tmp && tmp->end < start) - tmp = tmp->sibling; - - /* no entries overlap */ - if (!tmp) return 0; - - /* found one that starts behind the new one - ** Don't need to do anything. - */ - if (tmp->start >= end) return 0; - - if (tmp->start <= start) { - /* "front" of new one overlaps */ - new->start = tmp->end + 1; - - if (tmp->end >= end) { - /* AACCKK! totally overlaps! drop this range. */ - return 1; - } - } - - if (tmp->end < end ) { - /* "end" of new one overlaps */ - new->end = tmp->start - 1; - } - - printk(KERN_WARNING "LBA: Truncating lmmio_space [%lx/%lx] " - "to [%lx,%lx]\n", - start, end, - new->start, new->end ); - - return 0; /* truncation successful */ -} - #else -#define lba_claim_dev_resources(dev) do { } while (0) -#define truncate_pat_collision(r,n) (0) +#define lba_claim_dev_resources(dev) #endif + /* ** The algorithm is generic code. ** But it needs to access local data structures to get the IRQ base. @@ -807,9 +747,6 @@ lba_fixup_bus(struct pci_bus *bus) lba_dump_res(&ioport_resource, 2); BUG(); } - /* advertize Host bridge resources to PCI bus */ - bus->resource[0] = &(ldev->hba.io_space); - i = 1; if (ldev->hba.elmmio_space.start) { err = request_resource(&iomem_resource, @@ -823,35 +760,23 @@ lba_fixup_bus(struct pci_bus *bus) /* lba_dump_res(&iomem_resource, 2); */ /* BUG(); */ - } else - bus->resource[i++] = &(ldev->hba.elmmio_space); + } } - - /* Overlaps with elmmio can (and should) fail here. - * We will prune (or ignore) the distributed range. - * - * FIXME: SBA code should register all elmmio ranges first. - * that would take care of elmmio ranges routed - * to a different rope (already discovered) from - * getting registered *after* LBA code has already - * registered it's distributed lmmio range. - */ - if (truncate_pat_collision(&iomem_resource, - &(ldev->hba.lmmio_space))) { - - printk(KERN_WARNING "LBA: lmmio_space [%lx/%lx] duplicate!\n", - ldev->hba.lmmio_space.start, - ldev->hba.lmmio_space.end); - } else { - err = request_resource(&iomem_resource, &(ldev->hba.lmmio_space)); - if (err < 0) { - printk(KERN_ERR "FAILED: lba_fixup_bus() request for " + err = request_resource(&iomem_resource, &(ldev->hba.lmmio_space)); + if (err < 0) { + /* FIXME overlaps with elmmio will fail here. + * Need to prune (or disable) the distributed range. + * + * BEWARE: conflicts with this lmmio range may be + * elmmio range which is pointing down another rope. + */ + + printk("FAILED: lba_fixup_bus() request for " "lmmio_space [%lx/%lx]\n", ldev->hba.lmmio_space.start, ldev->hba.lmmio_space.end); - } else - bus->resource[i++] = &(ldev->hba.lmmio_space); + /* lba_dump_res(&iomem_resource, 2); */ } #ifdef CONFIG_64BIT @@ -866,10 +791,18 @@ lba_fixup_bus(struct pci_bus *bus) lba_dump_res(&iomem_resource, 2); BUG(); } - bus->resource[i++] = &(ldev->hba.gmmio_space); } #endif + /* advertize Host bridge resources to PCI bus */ + bus->resource[0] = &(ldev->hba.io_space); + bus->resource[1] = &(ldev->hba.lmmio_space); + i=2; + if (ldev->hba.elmmio_space.start) + bus->resource[i++] = &(ldev->hba.elmmio_space); + if (ldev->hba.gmmio_space.start) + bus->resource[i++] = &(ldev->hba.gmmio_space); + } list_for_each(ln, &bus->devices) { diff --git a/trunk/drivers/parisc/led.c b/trunk/drivers/parisc/led.c index f357d3f60360..315be4770d3e 100644 --- a/trunk/drivers/parisc/led.c +++ b/trunk/drivers/parisc/led.c @@ -3,7 +3,7 @@ * * (c) Copyright 2000 Red Hat Software * (c) Copyright 2000 Helge Deller - * (c) Copyright 2001-2005 Helge Deller + * (c) Copyright 2001-2004 Helge Deller * (c) Copyright 2001 Randolph Chung * * This program is free software; you can redistribute it and/or modify @@ -56,13 +56,13 @@ relatively large amount of CPU time, some of the calculations can be turned off with the following variables (controlled via procfs) */ -static int led_type __read_mostly = -1; +static int led_type = -1; static unsigned char lastleds; /* LED state from most recent update */ -static unsigned int led_heartbeat __read_mostly = 1; -static unsigned int led_diskio __read_mostly = 1; -static unsigned int led_lanrxtx __read_mostly = 1; -static char lcd_text[32] __read_mostly; -static char lcd_text_default[32] __read_mostly; +static unsigned int led_heartbeat = 1; +static unsigned int led_diskio = 1; +static unsigned int led_lanrxtx = 1; +static char lcd_text[32]; +static char lcd_text_default[32]; static struct workqueue_struct *led_wq; @@ -108,7 +108,7 @@ struct pdc_chassis_lcd_info_ret_block { /* lcd_info is pre-initialized to the values needed to program KittyHawk LCD's * HP seems to have used Sharp/Hitachi HD44780 LCDs most of the time. */ static struct pdc_chassis_lcd_info_ret_block -lcd_info __attribute__((aligned(8))) __read_mostly = +lcd_info __attribute__((aligned(8))) = { .model = DISPLAY_MODEL_LCD, .lcd_width = 16, @@ -144,7 +144,7 @@ static int start_task(void) device_initcall(start_task); /* ptr to LCD/LED-specific function */ -static void (*led_func_ptr) (unsigned char) __read_mostly; +static void (*led_func_ptr) (unsigned char); #ifdef CONFIG_PROC_FS static int led_proc_read(char *page, char **start, off_t off, int count, diff --git a/trunk/drivers/parisc/pdc_stable.c b/trunk/drivers/parisc/pdc_stable.c index 38bdca2fac6b..273a74179720 100644 --- a/trunk/drivers/parisc/pdc_stable.c +++ b/trunk/drivers/parisc/pdc_stable.c @@ -56,7 +56,7 @@ #include #include -#define PDCS_VERSION "0.10" +#define PDCS_VERSION "0.09" #define PDCS_ADDR_PPRI 0x00 #define PDCS_ADDR_OSID 0x40 @@ -70,7 +70,7 @@ MODULE_DESCRIPTION("sysfs interface to HP PDC Stable Storage data"); MODULE_LICENSE("GPL"); MODULE_VERSION(PDCS_VERSION); -static unsigned long pdcs_size __read_mostly; +static unsigned long pdcs_size = 0; /* This struct defines what we need to deal with a parisc pdc path entry */ struct pdcspath_entry { @@ -194,8 +194,7 @@ pdcspath_store(struct pdcspath_entry *entry) return -EIO; } - /* kobject is already registered */ - entry->ready = 2; + entry->ready = 1; DPRINTK("%s: device: 0x%p\n", __func__, entry->dev); @@ -654,21 +653,15 @@ pdcs_register_pathentries(void) { unsigned short i; struct pdcspath_entry *entry; - int err; for (i = 0; (entry = pdcspath_entries[i]); i++) { if (pdcspath_fetch(entry) < 0) continue; - if ((err = kobject_set_name(&entry->kobj, "%s", entry->name))) - return err; + kobject_set_name(&entry->kobj, "%s", entry->name); kobj_set_kset_s(entry, paths_subsys); - if ((err = kobject_register(&entry->kobj))) - return err; - - /* kobject is now registered */ - entry->ready = 2; - + kobject_register(&entry->kobj); + if (!entry->dev) continue; @@ -682,14 +675,14 @@ pdcs_register_pathentries(void) /** * pdcs_unregister_pathentries - Routine called when unregistering the module. */ -static inline void +static inline void __exit pdcs_unregister_pathentries(void) { unsigned short i; struct pdcspath_entry *entry; for (i = 0; (entry = pdcspath_entries[i]); i++) - if (entry->ready >= 2) + if (entry->ready) kobject_unregister(&entry->kobj); } @@ -711,7 +704,7 @@ pdc_stable_init(void) /* For now we'll register the pdc subsys within this driver */ if ((rc = firmware_register(&pdc_subsys))) - goto fail_firmreg; + return rc; /* Don't forget the info entry */ for (i = 0; (attr = pdcs_subsys_attrs[i]) && !error; i++) @@ -720,25 +713,12 @@ pdc_stable_init(void) /* register the paths subsys as a subsystem of pdc subsys */ kset_set_kset_s(&paths_subsys, pdc_subsys); - if ((rc= subsystem_register(&paths_subsys))) - goto fail_subsysreg; + subsystem_register(&paths_subsys); /* now we create all "files" for the paths subsys */ - if ((rc = pdcs_register_pathentries())) - goto fail_pdcsreg; - - return rc; + pdcs_register_pathentries(); -fail_pdcsreg: - pdcs_unregister_pathentries(); - subsystem_unregister(&paths_subsys); - -fail_subsysreg: - firmware_unregister(&pdc_subsys); - -fail_firmreg: - printk(KERN_INFO "PDC Stable Storage bailing out\n"); - return rc; + return 0; } static void __exit diff --git a/trunk/drivers/parisc/power.c b/trunk/drivers/parisc/power.c index 54b2b7f20b96..ff75e9296df9 100644 --- a/trunk/drivers/parisc/power.c +++ b/trunk/drivers/parisc/power.c @@ -2,7 +2,7 @@ * linux/arch/parisc/kernel/power.c * HP PARISC soft power switch support driver * - * Copyright (c) 2001-2005 Helge Deller + * Copyright (c) 2001-2002 Helge Deller * All rights reserved. * * @@ -102,7 +102,7 @@ static DECLARE_WORK(poweroff_work, deferred_poweroff, NULL); static void poweroff(void) { - static int powering_off __read_mostly; + static int powering_off; if (powering_off) return; @@ -113,7 +113,7 @@ static void poweroff(void) /* local time-counter for shutdown */ -static int shutdown_timer __read_mostly; +static int shutdown_timer; /* check, give feedback and start shutdown after one second */ static void process_shutdown(void) @@ -139,7 +139,7 @@ static void process_shutdown(void) DECLARE_TASKLET_DISABLED(power_tasklet, NULL, 0); /* soft power switch enabled/disabled */ -int pwrsw_enabled __read_mostly = 1; +int pwrsw_enabled = 1; /* * On gecko style machines (e.g. 712/xx and 715/xx) @@ -149,7 +149,7 @@ int pwrsw_enabled __read_mostly = 1; */ static void gecko_tasklet_func(unsigned long unused) { - if (unlikely(!pwrsw_enabled)) + if (!pwrsw_enabled) return; if (__getDIAG(25) & 0x80000000) { @@ -173,7 +173,7 @@ static void polling_tasklet_func(unsigned long soft_power_reg) { unsigned long current_status; - if (unlikely(!pwrsw_enabled)) + if (!pwrsw_enabled) return; current_status = gsc_readl(soft_power_reg); diff --git a/trunk/drivers/parport/Kconfig b/trunk/drivers/parport/Kconfig index f605dea57224..a665951b1586 100644 --- a/trunk/drivers/parport/Kconfig +++ b/trunk/drivers/parport/Kconfig @@ -121,7 +121,6 @@ config PARPORT_GSC tristate default GSC depends on PARPORT - select PARPORT_NOT_PC config PARPORT_SUNBPP tristate "Sparc hardware (EXPERIMENTAL)" diff --git a/trunk/drivers/video/stifb.c b/trunk/drivers/video/stifb.c index 56d71d6e9a72..fbb17332afd7 100644 --- a/trunk/drivers/video/stifb.c +++ b/trunk/drivers/video/stifb.c @@ -3,7 +3,7 @@ * Low level Frame buffer driver for HP workstations with * STI (standard text interface) video firmware. * - * Copyright (C) 2001-2005 Helge Deller + * Copyright (C) 2001-2004 Helge Deller * Portions Copyright (C) 2001 Thomas Bogendoerfer * * Based on: @@ -73,13 +73,16 @@ #include "sticore.h" /* REGION_BASE(fb_info, index) returns the virtual address for region */ -#define REGION_BASE(fb_info, index) \ - F_EXTEND(fb_info->sti->glob_cfg->region_ptrs[index]) +#ifdef __LP64__ + #define REGION_BASE(fb_info, index) \ + (fb_info->sti->glob_cfg->region_ptrs[index] | 0xffffffff00000000) +#else + #define REGION_BASE(fb_info, index) \ + fb_info->sti->glob_cfg->region_ptrs[index] +#endif #define NGLEDEVDEPROM_CRT_REGION 1 -#define NR_PALETTE 256 - typedef struct { __s32 video_config_reg; __s32 misc_video_start; @@ -109,7 +112,7 @@ struct stifb_info { ngle_rom_t ngle_rom; struct sti_struct *sti; int deviceSpecificConfig; - u32 pseudo_palette[16]; + u32 pseudo_palette[256]; }; static int __initdata stifb_bpp_pref[MAX_STI_ROMS]; @@ -349,10 +352,10 @@ ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable) #define IS_888_DEVICE(fb) \ (!(IS_24_DEVICE(fb))) -#define GET_FIFO_SLOTS(fb, cnt, numslots) \ -{ while (cnt < numslots) \ +#define GET_FIFO_SLOTS(fb, cnt, numslots) \ +{ while (cnt < numslots) \ cnt = READ_WORD(fb, REG_34); \ - cnt -= numslots; \ + cnt -= numslots; \ } #define IndexedDcd 0 /* Pixel data is indexed (pseudo) color */ @@ -992,7 +995,7 @@ stifb_setcolreg(u_int regno, u_int red, u_int green, struct stifb_info *fb = (struct stifb_info *) info; u32 color; - if (regno >= NR_PALETTE) + if (regno >= 256) /* no. of hw registers */ return 1; red >>= 8; @@ -1002,8 +1005,8 @@ stifb_setcolreg(u_int regno, u_int red, u_int green, DEBUG_OFF(); START_IMAGE_COLORMAP_ACCESS(fb); - - if (unlikely(fb->info.var.grayscale)) { + + if (fb->info.var.grayscale) { /* gray = 0.30*R + 0.59*G + 0.11*B */ color = ((red * 77) + (green * 151) + @@ -1014,17 +1017,17 @@ stifb_setcolreg(u_int regno, u_int red, u_int green, (blue)); } - if (fb->info.fix.visual == FB_VISUAL_DIRECTCOLOR) { - struct fb_var_screeninfo *var = &fb->info.var; - if (regno < 16) - ((u32 *)fb->info.pseudo_palette)[regno] = - regno << var->red.offset | - regno << var->green.offset | - regno << var->blue.offset; + if (info->var.bits_per_pixel == 32) { + ((u32 *)(info->pseudo_palette))[regno] = + (red << info->var.red.offset) | + (green << info->var.green.offset) | + (blue << info->var.blue.offset); + } else { + ((u32 *)(info->pseudo_palette))[regno] = regno; } WRITE_IMAGE_COLOR(fb, regno, color); - + if (fb->id == S9000_ID_HCRX) { NgleLutBltCtl lutBltCtl; @@ -1063,9 +1066,9 @@ stifb_blank(int blank_mode, struct fb_info *info) case S9000_ID_HCRX: HYPER_ENABLE_DISABLE_DISPLAY(fb, enable); break; - case S9000_ID_A1659A: /* fall through */ - case S9000_ID_TIMBER: - case CRX24_OVERLAY_PLANES: + case S9000_ID_A1659A:; /* fall through */ + case S9000_ID_TIMBER:; + case CRX24_OVERLAY_PLANES:; default: ENABLE_DISABLE_DISPLAY(fb, enable); break; @@ -1247,10 +1250,12 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref) memset(&fb->ngle_rom, 0, sizeof(fb->ngle_rom)); if ((fb->sti->regions_phys[0] & 0xfc000000) == (fb->sti->regions_phys[2] & 0xfc000000)) - sti_rom_address = F_EXTEND(fb->sti->regions_phys[0]); + sti_rom_address = fb->sti->regions_phys[0]; else - sti_rom_address = F_EXTEND(fb->sti->regions_phys[1]); - + sti_rom_address = fb->sti->regions_phys[1]; +#ifdef __LP64__ + sti_rom_address |= 0xffffffff00000000; +#endif fb->deviceSpecificConfig = gsc_readl(sti_rom_address); if (IS_24_DEVICE(fb)) { if (bpp_pref == 8 || bpp_pref == 32) @@ -1310,7 +1315,7 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref) break; case 32: fix->type = FB_TYPE_PACKED_PIXELS; - fix->visual = FB_VISUAL_DIRECTCOLOR; + fix->visual = FB_VISUAL_TRUECOLOR; var->red.length = var->green.length = var->blue.length = var->transp.length = 8; var->blue.offset = 0; var->green.offset = 8; @@ -1332,7 +1337,7 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref) info->pseudo_palette = &fb->pseudo_palette; /* This has to been done !!! */ - fb_alloc_cmap(&info->cmap, NR_PALETTE, 0); + fb_alloc_cmap(&info->cmap, 256, 0); stifb_init_display(fb); if (!request_mem_region(fix->smem_start, fix->smem_len, "stifb fb")) { @@ -1483,3 +1488,7 @@ module_exit(stifb_cleanup); MODULE_AUTHOR("Helge Deller , Thomas Bogendoerfer "); MODULE_DESCRIPTION("Framebuffer driver for HP's NGLE series graphics cards in HP PARISC machines"); MODULE_LICENSE("GPL v2"); + +MODULE_PARM(bpp, "i"); +MODULE_PARM_DESC(mem, "Bits per pixel (default: 8)"); + diff --git a/trunk/fs/afs/cmservice.c b/trunk/fs/afs/cmservice.c index 9eef6bf156ab..0a57fd7c726f 100644 --- a/trunk/fs/afs/cmservice.c +++ b/trunk/fs/afs/cmservice.c @@ -118,7 +118,7 @@ static int kafscmd(void *arg) _SRXAFSCM_xxxx_t func; int die; - printk(KERN_INFO "kAFS: Started kafscmd %d\n", current->pid); + printk("kAFS: Started kafscmd %d\n", current->pid); daemonize("kafscmd"); diff --git a/trunk/fs/attr.c b/trunk/fs/attr.c index d63e5096f2f2..b34732506f1d 100644 --- a/trunk/fs/attr.c +++ b/trunk/fs/attr.c @@ -14,6 +14,7 @@ #include #include #include +#include /* Taken over from the old code... */ diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index f979ebbce49c..a4f6f57d91aa 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -1634,17 +1634,17 @@ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file) ELF_CORE_WRITE_EXTRA_DATA; #endif - if ((off_t)file->f_pos != offset) { + if ((off_t) file->f_pos != offset) { /* Sanity check */ - printk(KERN_WARNING "elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", - (off_t)file->f_pos, offset); + printk("elf_core_dump: file->f_pos (%ld) != offset (%ld)\n", + (off_t) file->f_pos, offset); } end_coredump: set_fs(fs); cleanup: - while (!list_empty(&thread_list)) { + while(!list_empty(&thread_list)) { struct list_head *tmp = thread_list.next; list_del(tmp); kfree(list_entry(tmp, struct elf_thread_status, list)); diff --git a/trunk/fs/ext2/dir.c b/trunk/fs/ext2/dir.c index 7442bdd1267a..5b5f52876b42 100644 --- a/trunk/fs/ext2/dir.c +++ b/trunk/fs/ext2/dir.c @@ -592,7 +592,7 @@ int ext2_make_empty(struct inode *inode, struct inode *parent) goto fail; } kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr, 0, chunk_size); + memset(kaddr, 0, chunk_size); de = (struct ext2_dir_entry_2 *)kaddr; de->name_len = 1; de->rec_len = cpu_to_le16(EXT2_DIR_REC_LEN(1)); diff --git a/trunk/fs/proc/vmcore.c b/trunk/fs/proc/vmcore.c index 124e35442ac8..5378d7c78419 100644 --- a/trunk/fs/proc/vmcore.c +++ b/trunk/fs/proc/vmcore.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/fs/xfs/xfs_iomap.c b/trunk/fs/xfs/xfs_iomap.c index ca7afc83a893..45a77a3a6c07 100644 --- a/trunk/fs/xfs/xfs_iomap.c +++ b/trunk/fs/xfs/xfs_iomap.c @@ -40,6 +40,7 @@ #include "xfs_ialloc.h" #include "xfs_btree.h" #include "xfs_bmap.h" +#include "xfs_bit.h" #include "xfs_rtalloc.h" #include "xfs_error.h" #include "xfs_itable.h" diff --git a/trunk/include/asm-parisc/cache.h b/trunk/include/asm-parisc/cache.h index 93f179f13ce8..38d201b5652d 100644 --- a/trunk/include/asm-parisc/cache.h +++ b/trunk/include/asm-parisc/cache.h @@ -29,14 +29,14 @@ #define SMP_CACHE_BYTES L1_CACHE_BYTES -extern void flush_data_cache_local(void *); /* flushes local data-cache only */ -extern void flush_instruction_cache_local(void *); /* flushes local code-cache only */ +extern void flush_data_cache_local(void); /* flushes local data-cache only */ +extern void flush_instruction_cache_local(void); /* flushes local code-cache only */ #ifdef CONFIG_SMP extern void flush_data_cache(void); /* flushes data-cache only (all processors) */ extern void flush_instruction_cache(void); /* flushes i-cache only (all processors) */ #else -#define flush_data_cache() flush_data_cache_local(NULL) -#define flush_instruction_cache() flush_instruction_cache_local(NULL) +#define flush_data_cache flush_data_cache_local +#define flush_instruction_cache flush_instruction_cache_local #endif extern void parisc_cache_init(void); /* initializes cache-flushing */ diff --git a/trunk/include/asm-parisc/io.h b/trunk/include/asm-parisc/io.h index 0db00adc942a..b9bb5946ecc9 100644 --- a/trunk/include/asm-parisc/io.h +++ b/trunk/include/asm-parisc/io.h @@ -41,7 +41,7 @@ extern void __raw_bad_addr(const volatile void __iomem *addr); #define __raw_check_addr(addr) \ if (((unsigned long)addr >> NYBBLE_SHIFT) != 0xe) \ __raw_bad_addr(addr); \ - addr = (void __iomem *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT)); + addr = (void *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT)); #else #define gsc_check_addr(addr) #define __raw_check_addr(addr) diff --git a/trunk/include/asm-parisc/page.h b/trunk/include/asm-parisc/page.h index 4a6752b0afed..44eae9f8274d 100644 --- a/trunk/include/asm-parisc/page.h +++ b/trunk/include/asm-parisc/page.h @@ -135,13 +135,6 @@ extern int npmem_ranges; #define pfn_valid(pfn) ((pfn) < max_mapnr) #endif /* CONFIG_DISCONTIGMEM */ -#ifdef CONFIG_HUGETLB_PAGE -#define HPAGE_SHIFT 22 /* 4MB (is this fixed?) */ -#define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) -#define HPAGE_MASK (~(HPAGE_SIZE - 1)) -#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) -#endif - #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) diff --git a/trunk/include/asm-parisc/pci.h b/trunk/include/asm-parisc/pci.h index f277254159b7..fa39d07d49e9 100644 --- a/trunk/include/asm-parisc/pci.h +++ b/trunk/include/asm-parisc/pci.h @@ -84,17 +84,11 @@ static __inline__ int pci_is_lmmio(struct pci_hba_data *hba, unsigned long a) /* ** Convert between PCI (IO_VIEW) addresses and processor (PA_VIEW) addresses. ** See pcibios.c for more conversions used by Generic PCI code. -** -** Platform characteristics/firmware guarantee that -** (1) PA_VIEW - IO_VIEW = lmmio_offset for both LMMIO and ELMMIO -** (2) PA_VIEW == IO_VIEW for GMMIO */ #define PCI_BUS_ADDR(hba,a) (PCI_IS_LMMIO(hba,a) \ ? ((a) - hba->lmmio_space_offset) /* mangle LMMIO */ \ : (a)) /* GMMIO */ -#define PCI_HOST_ADDR(hba,a) (((a) & PCI_F_EXTEND) == 0 \ - ? (a) + hba->lmmio_space_offset \ - : (a)) +#define PCI_HOST_ADDR(hba,a) ((a) + hba->lmmio_space_offset) #else /* !CONFIG_64BIT */ diff --git a/trunk/include/asm-parisc/processor.h b/trunk/include/asm-parisc/processor.h index 89f2f1c16c12..aae40e8c3aa8 100644 --- a/trunk/include/asm-parisc/processor.h +++ b/trunk/include/asm-parisc/processor.h @@ -144,16 +144,16 @@ struct thread_struct { }) #define INIT_THREAD { \ - .regs = { .gr = { 0, }, \ - .fr = { 0, }, \ - .sr = { 0, }, \ - .iasq = { 0, }, \ - .iaoq = { 0, }, \ - .cr27 = 0, \ + regs: { gr: { 0, }, \ + fr: { 0, }, \ + sr: { 0, }, \ + iasq: { 0, }, \ + iaoq: { 0, }, \ + cr27: 0, \ }, \ - .task_size = DEFAULT_TASK_SIZE, \ - .map_base = DEFAULT_MAP_BASE, \ - .flags = 0 \ + task_size: DEFAULT_TASK_SIZE, \ + map_base: DEFAULT_MAP_BASE, \ + flags: 0 \ } /* diff --git a/trunk/include/asm-parisc/tlbflush.h b/trunk/include/asm-parisc/tlbflush.h index 825994a90e2d..c9ec39c6fc6c 100644 --- a/trunk/include/asm-parisc/tlbflush.h +++ b/trunk/include/asm-parisc/tlbflush.h @@ -22,7 +22,6 @@ extern spinlock_t pa_tlb_lock; #define purge_tlb_end(x) spin_unlock(&pa_tlb_lock) extern void flush_tlb_all(void); -extern void flush_tlb_all_local(void *); /* * flush_tlb_mm() diff --git a/trunk/include/asm-powerpc/elf.h b/trunk/include/asm-powerpc/elf.h index 45f2af6f89c4..c5a635d9bba4 100644 --- a/trunk/include/asm-powerpc/elf.h +++ b/trunk/include/asm-powerpc/elf.h @@ -92,6 +92,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include #define ELF_NGREG 48 /* includes nip, msr, lr, etc. */ #define ELF_NFPREG 33 /* includes fpscr */ diff --git a/trunk/include/linux/cache.h b/trunk/include/linux/cache.h index d22e632f41fb..ffe52210fc4f 100644 --- a/trunk/include/linux/cache.h +++ b/trunk/include/linux/cache.h @@ -13,7 +13,7 @@ #define SMP_CACHE_BYTES L1_CACHE_BYTES #endif -#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64) || defined(CONFIG_PARISC) +#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64) #define __read_mostly __attribute__((__section__(".data.read_mostly"))) #else #define __read_mostly diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h index e53d2c6fd5f4..3f1fafc0245e 100644 --- a/trunk/include/linux/mm.h +++ b/trunk/include/linux/mm.h @@ -1027,7 +1027,7 @@ kernel_map_pages(struct page *page, int numpages, int enable) { if (!PageHighMem(page) && !enable) mutex_debug_check_no_locks_freed(page_address(page), - numpages * PAGE_SIZE); + page_address(page + numpages)); } #endif diff --git a/trunk/include/linux/mutex-debug.h b/trunk/include/linux/mutex-debug.h index 8b5769f00467..8138d9eb58ec 100644 --- a/trunk/include/linux/mutex-debug.h +++ b/trunk/include/linux/mutex-debug.h @@ -18,6 +18,6 @@ extern void FASTCALL(mutex_destroy(struct mutex *lock)); extern void mutex_debug_show_all_locks(void); extern void mutex_debug_show_held_locks(struct task_struct *filter); extern void mutex_debug_check_no_locks_held(struct task_struct *task); -extern void mutex_debug_check_no_locks_freed(const void *from, unsigned long len); +extern void mutex_debug_check_no_locks_freed(const void *from, const void *to); #endif diff --git a/trunk/include/linux/mutex.h b/trunk/include/linux/mutex.h index f1ac507fa20d..9bce0fee68d4 100644 --- a/trunk/include/linux/mutex.h +++ b/trunk/include/linux/mutex.h @@ -12,7 +12,6 @@ #include #include -#include #include @@ -79,7 +78,7 @@ struct mutex_waiter { # define mutex_debug_show_all_locks() do { } while (0) # define mutex_debug_show_held_locks(p) do { } while (0) # define mutex_debug_check_no_locks_held(task) do { } while (0) -# define mutex_debug_check_no_locks_freed(from, len) do { } while (0) +# define mutex_debug_check_no_locks_freed(from, to) do { } while (0) #endif #define __MUTEX_INITIALIZER(lockname) \ diff --git a/trunk/kernel/mutex-debug.c b/trunk/kernel/mutex-debug.c index f4913c376950..6f829058ae4a 100644 --- a/trunk/kernel/mutex-debug.c +++ b/trunk/kernel/mutex-debug.c @@ -333,10 +333,9 @@ void mutex_debug_check_no_locks_held(struct task_struct *task) * is destroyed or reinitialized - this code checks whether there is * any held lock in the memory range of to : */ -void mutex_debug_check_no_locks_freed(const void *from, unsigned long len) +void mutex_debug_check_no_locks_freed(const void *from, const void *to) { struct list_head *curr, *next; - const void *to = from + len; unsigned long flags; struct mutex *lock; void *lock_addr; @@ -438,7 +437,7 @@ void debug_mutex_init(struct mutex *lock, const char *name) /* * Make sure we are not reinitializing a held lock: */ - mutex_debug_check_no_locks_freed((void *)lock, sizeof(*lock)); + mutex_debug_check_no_locks_freed((void *)lock, (void *)(lock + 1)); lock->owner = NULL; INIT_LIST_HEAD(&lock->held_list); lock->name = name; diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 8e363536e2da..a5e6891f7bb6 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -417,7 +417,7 @@ static void __free_pages_ok(struct page *page, unsigned int order) arch_free_page(page, order); if (!PageHighMem(page)) mutex_debug_check_no_locks_freed(page_address(page), - PAGE_SIZE<magic.magic,10)) swap_header_version = 2; else { - printk(KERN_ERR "Unable to find swap-space signature\n"); + printk("Unable to find swap-space signature\n"); error = -EINVAL; goto bad_swap; } diff --git a/trunk/net/core/wireless.c b/trunk/net/core/wireless.c index 2add7ed609e9..f88b0affb3b9 100644 --- a/trunk/net/core/wireless.c +++ b/trunk/net/core/wireless.c @@ -78,7 +78,6 @@ #include #include /* for __init */ #include /* ARPHRD_ETHER */ -#include /* compare_ether_addr */ #include /* Pretty obvious */ #include /* New driver API */ diff --git a/trunk/net/decnet/netfilter/dn_rtmsg.c b/trunk/net/decnet/netfilter/dn_rtmsg.c index 16a5a31e2126..1ab94c6e22ed 100644 --- a/trunk/net/decnet/netfilter/dn_rtmsg.c +++ b/trunk/net/decnet/netfilter/dn_rtmsg.c @@ -26,6 +26,8 @@ #include #include +#include + static struct sock *dnrmg = NULL; diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index 3021af0910f1..f2a90e2743d7 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_icmp.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index e0dc37063545..ea2b39c18050 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c @@ -32,6 +32,7 @@ #include +#include #include #include #include diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c index 55b7d3210adf..004003fd6117 100644 --- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c +++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_udp.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/trunk/net/ipv6/Makefile b/trunk/net/ipv6/Makefile index 41877abd22e6..bf18cff13120 100644 --- a/trunk/net/ipv6/Makefile +++ b/trunk/net/ipv6/Makefile @@ -12,14 +12,13 @@ ipv6-objs := af_inet6.o anycast.o ip6_output.o ip6_input.o addrconf.o sit.o \ ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ xfrm6_output.o -ipv6-$(CONFIG_NETFILTER) += netfilter.o ipv6-objs += $(ipv6-y) obj-$(CONFIG_INET6_AH) += ah6.o obj-$(CONFIG_INET6_ESP) += esp6.o obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o -obj-$(CONFIG_NETFILTER) += netfilter/ +obj-$(CONFIG_NETFILTER) += netfilter.o netfilter/ obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o diff --git a/trunk/net/ipv6/netfilter.c b/trunk/net/ipv6/netfilter.c index d750cfc019dc..1ab62f033664 100644 --- a/trunk/net/ipv6/netfilter.c +++ b/trunk/net/ipv6/netfilter.c @@ -90,10 +90,7 @@ int __init ipv6_netfilter_init(void) return nf_register_queue_rerouter(PF_INET6, &ip6_reroute); } -/* This can be called from inet6_init() on errors, so it cannot - * be marked __exit. -DaveM - */ -void ipv6_netfilter_fini(void) +void __exit ipv6_netfilter_fini(void) { nf_unregister_queue_rerouter(PF_INET6); } diff --git a/trunk/sound/oss/harmony.c b/trunk/sound/oss/harmony.c index 591683c55f27..bee9d344cd26 100644 --- a/trunk/sound/oss/harmony.c +++ b/trunk/sound/oss/harmony.c @@ -1236,7 +1236,7 @@ harmony_driver_probe(struct parisc_device *dev) } /* Set the HPA of harmony */ - harmony.hpa = (struct harmony_hpa *)dev->hpa.start; + harmony.hpa = (struct harmony_hpa *)dev->hpa; harmony.dev = dev; /* Grab the ID and revision from the device */ @@ -1250,7 +1250,7 @@ harmony_driver_probe(struct parisc_device *dev) printk(KERN_INFO "Lasi Harmony Audio driver " HARMONY_VERSION ", " "h/w id %i, rev. %i at 0x%lx, IRQ %i\n", - id, rev, dev->hpa.start, harmony.dev->irq); + id, rev, dev->hpa, harmony.dev->irq); /* Make sure the control bit isn't set, although I don't think it ever is. */