get rid if __cpuinit and __cpuexit
Subsystems (37)
PATCH 1/1 get rid if __cpuinit and __cpuexit
Quoted 2 lines
From
b62f70d43d3e9a9a70775b40cb4ecba058f07a01Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Wed, 22 Oct 2008 15:29:00 -0700
Subject: [PATCH] get rid if __cpuinit and __cpuexit
as discussed briefly at the kernel summit; __cpuinit and __cpuexit are causing a ton more complexity than they're worth (just see how many section warnings an average build has); and the *vast* majority
of people using linux have CPU hotplug enabled anyway (since it's required for suspend/resume). The code size saved is also very minimal, since although many files are touched, very few are actually present in a kernel image at a time.
For now, __cpuinit and __cpuexit are left behind as empty skelletons to not break in-flight stuff using it, it should be removed in a release or two entirely.
Signed-off-by Arjan van de Ven <[email protected]>
--- Documentation/cpu-hotplug.txt | 4 +- arch/alpha/kernel/smp.c | 4 +- arch/arm/common/gic.c | 2 +- arch/arm/kernel/smp.c | 12 ++-- arch/arm/mach-realview/localtimer.c | 8 ++-- arch/arm/mach-realview/platsmp.c | 6 +- arch/cris/arch-v32/kernel/smp.c | 2 +- arch/frv/kernel/setup.c | 2 +- arch/ia64/kernel/err_inject.c | 8 ++-- arch/ia64/kernel/mca.c | 12 ++-- arch/ia64/kernel/numa.c | 4 +- arch/ia64/kernel/palinfo.c | 4 +- arch/ia64/kernel/salinfo.c | 4 +- arch/ia64/kernel/setup.c | 10 ++-- arch/ia64/kernel/smpboot.c | 12 ++-- arch/ia64/kernel/topology.c | 18 ++++---- arch/ia64/mm/contig.c | 2 +- arch/ia64/mm/discontig.c | 2 +- arch/ia64/sn/kernel/setup.c | 4 +- arch/m32r/kernel/smpboot.c | 2 +- arch/mips/kernel/cevt-bcm1480.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cevt-sb1250.c | 2 +- arch/mips/kernel/cevt-smtc.c | 2 +- arch/mips/kernel/cpu-bugs64.c | 4 +- arch/mips/kernel/cpu-probe.c | 10 ++-- arch/mips/kernel/smp-mt.c | 6 +- arch/mips/kernel/smp-up.c | 6 +- arch/mips/kernel/smp.c | 6 +- arch/mips/kernel/smtc.c | 2 +- arch/mips/kernel/spram.c | 14 +++--- arch/mips/kernel/time.c | 2 +- arch/mips/kernel/traps.c | 8 ++-- arch/mips/kernel/watch.c | 2 +- arch/mips/lib/uncached.c | 2 +- arch/mips/mipssim/sim_smtc.c | 6 +- arch/mips/mipssim/sim_time.c | 2 +- arch/mips/mm/c-r3k.c | 8 ++-- arch/mips/mm/c-r4k.c | 34 +++++++------- arch/mips/mm/c-tx39.c | 2 +- arch/mips/mm/page.c | 40 ++++++++-------- arch/mips/mm/sc-ip22.c | 2 +- arch/mips/mm/sc-mips.c | 2 +- arch/mips/mm/sc-r5k.c | 2 +- arch/mips/mm/sc-rm7k.c | 6 +- arch/mips/mm/tlb-r3k.c | 2 +- arch/mips/mm/tlb-r4k.c | 8 ++-- arch/mips/mm/tlb-r8k.c | 4 +- arch/mips/mm/tlbex.c | 70 ++++++++++++++-------------- arch/mips/mm/uasm.c | 70 ++++++++++++++-------------- arch/mips/mm/uasm.h | 24 +++++----- arch/mips/mti-malta/malta-smtc.c | 6 +- arch/mips/mti-malta/malta-time.c | 2 +- arch/mips/pci/pci-ip27.c | 2 +- arch/mips/pmc-sierra/yosemite/smp.c | 12 ++-- arch/mips/sgi-ip27/ip27-init.c | 4 +- arch/mips/sgi-ip27/ip27-smp.c | 6 +- arch/mips/sgi-ip27/ip27-timer.c | 6 +- arch/mips/sgi-ip27/ip27-xtalk.c | 6 +- arch/mips/sibyte/bcm1480/smp.c | 8 ++-- arch/mips/sibyte/sb1250/smp.c | 8 ++-- arch/parisc/kernel/hardware.c | 2 +- arch/parisc/kernel/processor.c | 2 +- arch/parisc/kernel/smp.c | 4 +- arch/powerpc/kernel/smp.c | 2 +- arch/powerpc/kernel/sysfs.c | 12 ++-- arch/powerpc/mm/numa.c | 12 ++-- arch/s390/appldata/appldata_base.c | 8 ++-- arch/s390/kernel/entry.h | 2 +- arch/s390/kernel/setup.c | 4 +- arch/s390/kernel/smp.c | 10 ++-- arch/sh/kernel/smp.c | 4 +- arch/sh/kernel/traps_32.c | 2 +- arch/sparc/kernel/smp.c | 8 ++-- arch/sparc/kernel/sun4d_smp.c | 2 +- arch/sparc/kernel/sun4m_smp.c | 4 +- arch/sparc64/kernel/ds.c | 4 +- arch/sparc64/kernel/entry.h | 2 +- arch/sparc64/kernel/irq.c | 4 +- arch/sparc64/kernel/mdesc.c | 2 +- arch/sparc64/kernel/smp.c | 4 +- arch/sparc64/kernel/sysfs.c | 4 +- arch/sparc64/mm/init.c | 2 +- arch/x86/kernel/acpi/boot.c | 4 +- arch/x86/kernel/apic_32.c | 12 ++-- arch/x86/kernel/apic_64.c | 18 ++++---- arch/x86/kernel/cpu/addon_cpuid_features.c | 6 +- arch/x86/kernel/cpu/amd.c | 22 ++++---- arch/x86/kernel/cpu/centaur.c | 26 +++++----- arch/x86/kernel/cpu/centaur_64.c | 6 +- arch/x86/kernel/cpu/common.c | 58 +++++++++++----------- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 4 +- arch/x86/kernel/cpu/cyrix.c | 40 ++++++++-------- arch/x86/kernel/cpu/intel.c | 22 ++++---- arch/x86/kernel/cpu/intel_cacheinfo.c | 44 +++++++++--------- arch/x86/kernel/cpu/mcheck/mce_64.c | 16 +++--- arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 10 ++-- arch/x86/kernel/cpu/mcheck/mce_intel_64.c | 4 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 8 ++-- arch/x86/kernel/cpu/transmeta.c | 6 +- arch/x86/kernel/cpu/umc.c | 2 +- arch/x86/kernel/cpuid.c | 4 +- arch/x86/kernel/ds.c | 2 +- arch/x86/kernel/genx2apic_uv_x.c | 4 +- arch/x86/kernel/i387.c | 6 +- arch/x86/kernel/irq_32.c | 2 +- arch/x86/kernel/microcode_core.c | 2 +- arch/x86/kernel/mmconf-fam10h_64.c | 14 +++--- arch/x86/kernel/msr.c | 4 +- arch/x86/kernel/numaq_32.c | 4 +- arch/x86/kernel/process.c | 8 ++-- arch/x86/kernel/ptrace.c | 2 +- arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/setup_percpu.c | 16 +++--- arch/x86/kernel/smpboot.c | 28 ++++++------ arch/x86/kernel/smpcommon.c | 2 +- arch/x86/kernel/tlb_64.c | 2 +- arch/x86/kernel/tsc.c | 2 +- arch/x86/kernel/tsc_sync.c | 18 ++++---- arch/x86/kernel/vsyscall_64.c | 6 +- arch/x86/kernel/xsave.c | 2 +- arch/x86/mach-voyager/voyager_smp.c | 4 +- arch/x86/mm/init_64.c | 4 +- arch/x86/mm/numa_64.c | 2 +- arch/x86/mm/pat.c | 2 +- arch/x86/pci/amd_bus.c | 4 +- arch/x86/xen/setup.c | 6 +- arch/x86/xen/smp.c | 8 ++-- arch/x86/xen/spinlock.c | 2 +- arch/x86/xen/xen-ops.h | 2 +- arch/xtensa/kernel/time.c | 2 +- block/blk-softirq.c | 4 +- drivers/acpi/ec.c | 2 +- drivers/acpi/numa.c | 2 +- drivers/acpi/processor_core.c | 4 +- drivers/acpi/processor_idle.c | 4 +- drivers/base/cpu.c | 4 +- drivers/base/topology.c | 8 ++-- drivers/cpufreq/cpufreq.c | 2 +- drivers/cpufreq/cpufreq_stats.c | 2 +- drivers/hwmon/coretemp.c | 4 +- drivers/infiniband/hw/ehca/ehca_irq.c | 6 +- drivers/s390/sysinfo.c | 2 +- include/asm-x86/ds.h | 2 +- include/asm-x86/mmconfig.h | 4 +- include/asm-x86/mpspec.h | 2 +- include/asm-x86/numa_64.h | 8 ++-- include/asm-x86/ptrace.h | 2 +- include/asm-x86/smp.h | 4 +- include/linux/cpu.h | 2 +- include/linux/init.h | 9 +-- init/calibrate.c | 6 +- kernel/cpu.c | 6 +- kernel/fork.c | 4 +- kernel/hrtimer.c | 6 +- kernel/rcuclassic.c | 6 +- kernel/rcupreempt.c | 6 +- kernel/relay.c | 2 +- kernel/sched.c | 8 ++-- kernel/smp.c | 2 +- kernel/softirq.c | 8 ++-- kernel/softlockup.c | 4 +- kernel/timer.c | 10 ++-- lib/percpu_counter.c | 2 +- mm/page-writeback.c | 4 +- mm/page_alloc.c | 6 +- mm/slab.c | 10 ++-- mm/slub.c | 4 +- mm/vmstat.c | 6 +- net/iucv/iucv.c | 2 +- 170 files changed, 642 insertions(+), 645 deletions(-)
Documentation/cpu-hotplug.txt +2 -2
@@ -236,7 +236,7 @@ Q: If i have some kernel code that needs to be aware of CPU arrival and A: This is what you would need in your kernel code to receive notifications. #include <linux/cpu.h> - static int __cpuinit foobar_cpu_callback(struct notifier_block *nfb, + static int foobar_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu;
@@ -254,7 +254,7 @@ A: This is what you would need in your kernel code to receive notifications. return NOTIFY_OK; } - static struct notifier_block __cpuinitdata foobar_cpu_notifer = + static struct notifier_block foobar_cpu_notifer = { .notifier_call = foobar_cpu_callback, };
arch/alpha/kernel/smp.c +2 -2
@@ -360,7 +360,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle)/* * Bring one cpu online. */ -static int __cpuinit +static int smp_boot_one_cpu (int cpuid) {struct task_struct *idle;
@@ -488,7 +488,7 @@ smp_prepare_boot_cpu(void) { } -int __cpuinit +int __cpu_up (unsigned int cpu) {smp_boot_one_cpu (cpu);
arch/arm/common/gic.c +1 -1
@@ -241,7 +241,7 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base,writel (1 , base +GIC_DIST_CTRL ); } -void __cpuinit gic_cpu_init (unsigned int gic_nr,void __iomem *base) +void gic_cpu_init (unsigned int gic_nr,void __iomem *base) {if (gic_nr >=MAX_GIC_NR )BUG ();
arch/arm/kernel/smp.c +6 -6
@@ -72,7 +72,7 @@ enum ipi_msg_type { IPI_CPU_STOP, }; -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {struct cpuinfo_arm *ci = &per_cpu (cpu_data, cpu);struct task_struct *idle = ci->idle;
@@ -157,7 +157,7 @@ int __cpuinit __cpu_up(unsigned int cpu)/* * __cpu_disable runs on the processor to be shutdown. */ -int __cpuexit __cpu_disable(void) +int __cpu_disable (void ) {unsigned int cpu =smp_processor_id ();struct task_struct *p;
@@ -204,7 +204,7 @@ int __cpuexit __cpu_disable(void)* called on the thread which is asking for a CPU to be shutdown - * waits until shutdown has completed, or it is timed out. */ -void __cpuexit __cpu_die(unsigned int cpu) +void __cpu_die (unsigned int cpu) {if (!platform_cpu_kill (cpu))printk ("CPU%u: unable to kill\n" , cpu);
@@ -218,7 +218,7 @@ void __cpuexit __cpu_die(unsigned int cpu)* of the other hotplug-cpu capable cores, so presumably coming * out of idle fixes this. */ -void __cpuexit cpu_die(void) +void cpu_die (void ) {unsigned int cpu =smp_processor_id ();
@@ -247,7 +247,7 @@ void __cpuexit cpu_die(void)* This is the secondary CPU boot entry. We're using this CPUs * idle thread stack, but a set of temporary page tables. */ -asmlinkage void __cpuinit secondary_start_kernel(void) +asmlinkage void secondary_start_kernel(void) {struct mm_struct *mm = &init_mm;unsigned int cpu =smp_processor_id ();
@@ -305,7 +305,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)* Called by both boot and secondaries to move global data into * per-processor storage. */ -void __cpuinit smp_store_cpu_info (unsigned int cpuid) +void smp_store_cpu_info (unsigned int cpuid) {struct cpuinfo_arm *cpu_info = &per_cpu (cpu_data, cpuid);
arch/arm/mach-realview/localtimer.c +4 -4
@@ -101,7 +101,7 @@ int local_timer_ack(void)return 0 ; } -static void __cpuinit twd_calibrate_rate (unsigned int cpu) +static void twd_calibrate_rate (unsigned int cpu) {void __iomem *base =TWD_BASE (cpu);unsigned long load, count;
@@ -148,7 +148,7 @@ static void __cpuinit twd_calibrate_rate(unsigned int cpu)/* * Setup the local clock events for a CPU. */ -void __cpuinit local_timer_setup (unsigned int cpu) +void local_timer_setup (unsigned int cpu) {struct clock_event_device *clk = &per_cpu (local_clockevent, cpu);unsigned long flags;
@@ -178,7 +178,7 @@ void __cpuinit local_timer_setup(unsigned int cpu)/* * take a local timer down */ -void __cpuexit local_timer_stop(unsigned int cpu) +void local_timer_stop (unsigned int cpu) {__raw_writel (0 ,TWD_BASE (cpu) +TWD_TIMER_CONTROL ); }
@@ -190,7 +190,7 @@ static void dummy_timer_set_mode(enum clock_event_mode mode, { } -void __cpuinit local_timer_setup (unsigned int cpu) +void local_timer_setup (unsigned int cpu) {struct clock_event_device *clk = &per_cpu (local_clockevent, cpu);
arch/arm/mach-realview/platsmp.c +3 -3
@@ -29,7 +29,7 @@ extern void realview_secondary_startup(void);* control for which core is the next to come out of the secondary * boot "holding pen" */ -volatile int __cpuinitdata pen_release =-1 ; +volatile int pen_release =-1 ;static unsigned int __init get_core_count (void ) {
@@ -72,7 +72,7 @@ static void scu_enable(void)static DEFINE_SPINLOCK (boot_lock); -void __cpuinit platform_secondary_init (unsigned int cpu) +void platform_secondary_init (unsigned int cpu) {trace_hardirqs_off ();
@@ -107,7 +107,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)spin_unlock (&boot_lock); } -int __cpuinit boot_secondary (unsigned int cpu,struct task_struct *idle) +int boot_secondary (unsigned int cpu,struct task_struct *idle) {unsigned long timeout;
arch/cris/arch-v32/kernel/smp.c +1 -1
@@ -211,7 +211,7 @@ int setup_profiling_timer(unsigned int multiplier)*/ unsigned long cache_decay_ticks =1 ; -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {smp_boot_one_cpu (cpu);return cpu_online (cpu) ?0 : -ENOSYS ;
arch/frv/kernel/setup.c +1 -1
@@ -708,7 +708,7 @@ static void __init reserve_dma_coherent(void)/* * calibrate the delay loop */ -void __cpuinit calibrate_delay (void ) +void calibrate_delay (void ) { loops_per_jiffy = __delay_loops_MHz * (1000000 /HZ );
arch/ia64/kernel/err_inject.c +4 -4
@@ -225,17 +225,17 @@ static struct attribute_group err_inject_attr_group = { .name = "err_inject" };/* Add/Remove err_inject interface for CPU device */ -static int __cpuinit err_inject_add_dev (struct sys_device * sys_dev) +static int err_inject_add_dev (struct sys_device * sys_dev) {return sysfs_create_group (&sys_dev->kobj, &err_inject_attr_group); } -static int __cpuinit err_inject_remove_dev (struct sys_device * sys_dev) +static int err_inject_remove_dev (struct sys_device * sys_dev) {sysfs_remove_group (&sys_dev->kobj, &err_inject_attr_group);return 0 ; } -static int __cpuinit err_inject_cpu_callback (struct notifier_block *nfb, +static int err_inject_cpu_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {unsigned int cpu = (unsigned long )hcpu;
@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,return NOTIFY_OK ; } -static struct notifier_block __cpuinitdata err_inject_cpu_notifier = +static struct notifier_block err_inject_cpu_notifier = { .notifier_call = err_inject_cpu_callback, };
arch/ia64/kernel/mca.c +6 -6
@@ -629,7 +629,7 @@ ia64_mca_register_cpev (int cpev)* Outputs * None */ -void __cpuinit +void ia64_mca_cmc_vector_setup (void ) {cmcv_reg_t cmcv;
@@ -1779,7 +1779,7 @@ static struct irqaction mca_cpep_irqaction = {* format most of the fields. */ -static void __cpuinit +static void format_mca_init_stack (void *mca_data,unsigned long offset,const char *type,int cpu) {
@@ -1809,7 +1809,7 @@ static void * __init_refok mca_bootmem(void) }/* Do per-CPU MCA-related initialization. */ -void __cpuinit +void ia64_mca_cpu_init (void *cpu_data) {void *pal_vaddr;
@@ -1861,7 +1861,7 @@ ia64_mca_cpu_init(void *cpu_data) PAGE_KERNEL)); } -static void __cpuinit ia64_mca_cmc_vector_adjust (void *dummy) +static void ia64_mca_cmc_vector_adjust (void *dummy) {unsigned long flags;
@@ -1871,7 +1871,7 @@ static void __cpuinit ia64_mca_cmc_vector_adjust(void *dummy)local_irq_restore (flags); } -static int __cpuinit mca_cpu_callback (struct notifier_block *nfb, +static int mca_cpu_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {
@@ -1887,7 +1887,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,return NOTIFY_OK ; } -static struct notifier_block mca_cpu_notifier__cpuinitdata = { +static struct notifier_block mca_cpu_notifier = { .notifier_call = mca_cpu_callback };
arch/ia64/kernel/numa.c +2 -2
@@ -30,7 +30,7 @@ EXPORT_SYMBOL(cpu_to_node_map); cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;EXPORT_SYMBOL (node_to_cpu_mask); -void __cpuinit map_cpu_to_node (int cpu,int nid) +void map_cpu_to_node (int cpu,int nid) {int oldnid;if (nid <0 ) {/* just initialize by zero */
@@ -51,7 +51,7 @@ void __cpuinit map_cpu_to_node(int cpu, int nid)return ; } -void __cpuinit unmap_cpu_from_node (int cpu,int nid) +void unmap_cpu_from_node (int cpu,int nid) {WARN_ON (!cpu_isset (cpu, node_to_cpu_mask[nid]));WARN_ON (cpu_to_node_map[cpu] != nid);
arch/ia64/kernel/palinfo.c +2 -2
@@ -968,7 +968,7 @@ palinfo_read_entry(char *page, char **start, off_t off, int count, int *eof, voireturn len; } -static void __cpuinit +static void create_palinfo_proc_entries (unsigned int cpu) {# define CPUSTR "cpu%d"
@@ -1029,7 +1029,7 @@ remove_palinfo_proc_entries(unsigned int hcpu) } } -static int __cpuinit palinfo_cpu_callback (struct notifier_block *nfb, +static int palinfo_cpu_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {unsigned int hotcpu = (unsigned long )hcpu;
arch/ia64/kernel/salinfo.c +2 -2
@@ -574,7 +574,7 @@ static const struct file_operations salinfo_data_fops = { .write = salinfo_log_write, }; -static int __cpuinit +static int salinfo_cpu_callback (struct notifier_block *nb,unsigned long action,void *hcpu) {unsigned int i, cpu = (unsigned long )hcpu;
@@ -615,7 +615,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpureturn NOTIFY_OK ; } -static struct notifier_block salinfo_cpu_notifier__cpuinitdata = +static struct notifier_block salinfo_cpu_notifier = { .notifier_call = salinfo_cpu_callback, .priority =0 ,
arch/ia64/kernel/setup.c +5 -5
@@ -742,7 +742,7 @@ const struct seq_operations cpuinfo_op = {#define MAX_BRANDS 8static char brandname[MAX_BRANDS ][128 ]; -static char *__cpuinit +static char *get_model_name (__u8 family,__u8 model) {static int overflow;
@@ -772,7 +772,7 @@ get_model_name(__u8 family, __u8 model)return "Unknown" ; } -static void __cpuinit +static void identify_cpu (struct cpuinfo_ia64 *c) {union {
@@ -852,7 +852,7 @@ setup_per_cpu_areas (void)* In addition, the minimum of the i-cache stride sizes is calculated for * "flush_icache_range()". */ -static void __cpuinit +static void get_max_cacheline_size (void ) {unsigned long line_size, max =1 ;
@@ -909,10 +909,10 @@ get_max_cacheline_size (void)* cpu_init() initializes state that is per-CPU. This function acts * as a 'CPU state barrier', nothing should get across. */ -void __cpuinit +void cpu_init (void ) { -extern void __cpuinit ia64_mmu_init (void *); +extern void ia64_mmu_init (void *);static unsigned long max_num_phys_stacked =IA64_NUM_PHYS_STACK_REG ;unsigned long num_phys_stacked;pal_vm_info_2_u_t vmi;
arch/ia64/kernel/smpboot.c +6 -6
@@ -373,7 +373,7 @@ smp_setup_percpu_timer (void) { } -static void __cpuinit +static void smp_callin (void ) {int cpuid, phys_id, itc_master;
@@ -464,7 +464,7 @@ smp_callin (void)/* * Activate a secondary processor. head.S calls this. */ -int __cpuinit +int start_secondary (void *unused) {/* Early console may use I/O ports */
@@ -481,7 +481,7 @@ start_secondary (void *unused)return 0 ; } -struct pt_regs *__cpuinit idle_regs (struct pt_regs *regs) +struct pt_regs *idle_regs (struct pt_regs *regs) {return NULL ; }
@@ -493,7 +493,7 @@ struct create_idle {int cpu; }; -void __cpuinit +void do_fork_idle (struct work_struct *work) { struct create_idle *c_idle =
@@ -503,7 +503,7 @@ do_fork_idle(struct work_struct *work)complete (&c_idle->done); } -static int __cpuinit +static int do_boot_cpu (int sapicid,int cpu) {int timeout;
@@ -807,7 +807,7 @@ set_cpu_sibling_map(int cpu) } } -int __cpuinit +int __cpu_up (unsigned int cpu) {int ret;
arch/ia64/kernel/topology.c +9 -9
@@ -131,11 +131,11 @@ struct cpu_cache_info {struct kobject kobj; }; -static struct cpu_cache_info all_cpu_cache_info[NR_CPUS ]__cpuinitdata ; +static struct cpu_cache_info all_cpu_cache_info[NR_CPUS ];#define LEAF_KOBJECT_PTR (x,y) (&all_cpu_cache_info[x].cache_leaves[y])#ifdef CONFIG_SMP -static void __cpuinit cache_shared_cpu_map_setup (unsigned int cpu, +static void cache_shared_cpu_map_setup (unsigned int cpu,struct cache_info * this_leaf) {pal_cache_shared_info_t csi;
@@ -170,7 +170,7 @@ static void __cpuinit cache_shared_cpu_map_setup( unsigned int cpu, &csi) == PAL_STATUS_SUCCESS); }#else -static void __cpuinit cache_shared_cpu_map_setup (unsigned int cpu, +static void cache_shared_cpu_map_setup (unsigned int cpu,struct cache_info * this_leaf) {cpu_set (cpu, this_leaf->shared_cpu_map);
@@ -293,7 +293,7 @@ static struct kobj_type cache_ktype_percpu_entry = { .sysfs_ops = &cache_sysfs_ops, }; -static void __cpuinit cpu_cache_sysfs_exit (unsigned int cpu) +static void cpu_cache_sysfs_exit (unsigned int cpu) {kfree (all_cpu_cache_info[cpu].cache_leaves); all_cpu_cache_info[cpu].cache_leaves =NULL ;
@@ -302,7 +302,7 @@ static void __cpuinit cpu_cache_sysfs_exit(unsigned int cpu)return ; } -static int __cpuinit cpu_cache_sysfs_init (unsigned int cpu) +static int cpu_cache_sysfs_init (unsigned int cpu) {u64 i, levels, unique_caches;pal_cache_config_info_t cci;
@@ -346,7 +346,7 @@ static int __cpuinit cpu_cache_sysfs_init(unsigned int cpu) }/* Add cache interface for CPU device */ -static int __cpuinit cache_add_dev (struct sys_device * sys_dev) +static int cache_add_dev (struct sys_device * sys_dev) {unsigned int cpu = sys_dev->id;unsigned long i, j;
@@ -392,7 +392,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) }/* Remove cache interface for CPU device */ -static int __cpuinit cache_remove_dev (struct sys_device * sys_dev) +static int cache_remove_dev (struct sys_device * sys_dev) {unsigned int cpu = sys_dev->id;unsigned long i;
@@ -416,7 +416,7 @@ static int __cpuinit cache_remove_dev(struct sys_device * sys_dev)* When a cpu is hot-plugged, do a check and initiate * cache kobject if necessary */ -static int __cpuinit cache_cpu_callback (struct notifier_block *nfb, +static int cache_cpu_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {unsigned int cpu = (unsigned long )hcpu;
@@ -436,7 +436,7 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,return NOTIFY_OK ; } -static struct notifier_block __cpuinitdata cache_cpu_notifier = +static struct notifier_block cache_cpu_notifier = { .notifier_call = cache_cpu_callback };
arch/ia64/mm/contig.c +1 -1
@@ -151,7 +151,7 @@ static void *cpu_data;* * Allocate and setup per-cpu data areas. */ -void *__cpuinit +void *per_cpu_init (void ) {int cpu;
arch/ia64/mm/discontig.c +1 -1
@@ -493,7 +493,7 @@ void __init find_memory(void)* find_pernode_space() does most of this already, we just need to set * local_per_cpu_offset */ -void __cpuinit *per_cpu_init (void ) +void *per_cpu_init (void ) {int cpu;static int first_time =1 ;
arch/ia64/sn/kernel/setup.c +2 -2
@@ -192,7 +192,7 @@ void __init early_sn_setup(void) }extern int platform_intr_list[]; -static int __cpuinitdata shub_1_1_found; +static int shub_1_1_found;/* * sn_check_for_wars
@@ -561,7 +561,7 @@ static void __init sn_init_pdas(char **cmdline_p)* Also sets up a few fields in the nodepda. Also known as * platform_cpu_init() by the ia64 machvec code. */ -void __cpuinit sn_cpu_init (void ) +void sn_cpu_init (void ) {int cpuid;int cpuphyid;
arch/m32r/kernel/smpboot.c +1 -1
@@ -352,7 +352,7 @@ static void __init do_boot_cpu(int phys_id) } } -int __cpuinit __cpu_up (unsigned int cpu_id) +int __cpu_up (unsigned int cpu_id) {int timeout;
arch/mips/kernel/cevt-bcm1480.c +1 -1
@@ -107,7 +107,7 @@ static DEFINE_PER_CPU(struct clock_event_device, sibyte_hpt_clockevent); static DEFINE_PER_CPU(struct irqaction, sibyte_hpt_irqaction); static DEFINE_PER_CPU(char [18], sibyte_hpt_name); -void __cpuinit sb1480_clockevent_init (void ) +void sb1480_clockevent_init (void ) {unsigned int cpu =smp_processor_id ();unsigned int irq =K_BCM1480_INT_TIMER_0 + cpu;
arch/mips/kernel/cevt-r4k.c +1 -1
@@ -160,7 +160,7 @@ int c0_compare_int_usable(void)#ifndef CONFIG_MIPS_MT_SMTC -int __cpuinit mips_clockevent_init (void ) +int mips_clockevent_init (void ) {uint64_t mips_freq = mips_hpt_frequency;unsigned int cpu =smp_processor_id ();
arch/mips/kernel/cevt-sb1250.c +1 -1
@@ -105,7 +105,7 @@ static DEFINE_PER_CPU(struct clock_event_device, sibyte_hpt_clockevent); static DEFINE_PER_CPU(struct irqaction, sibyte_hpt_irqaction); static DEFINE_PER_CPU(char [18], sibyte_hpt_name); -void __cpuinit sb1250_clockevent_init (void ) +void sb1250_clockevent_init (void ) {unsigned int cpu =smp_processor_id ();unsigned int irq =K_INT_TIMER_0 + cpu;
arch/mips/kernel/cevt-smtc.c +1 -1
@@ -245,7 +245,7 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id) } -int __cpuinit mips_clockevent_init (void ) +int mips_clockevent_init (void ) {uint64_t mips_freq = mips_hpt_frequency;unsigned int cpu =smp_processor_id ();
arch/mips/kernel/cpu-bugs64.c +2 -2
@@ -167,7 +167,7 @@ static inline void check_mult_sh(void)panic (bug64hit, !R4000_WAR ? r4kwar : nowar); } -static volatile int daddi_ov__cpuinitdata =0 ; +static volatile int daddi_ov =0 ; asmlinkage void __init do_daddi_ov(struct pt_regs *regs) {
@@ -239,7 +239,7 @@ static inline void check_daddi(void)panic (bug64hit, !DADDI_WAR ? daddiwar : nowar); } -int daddiu_bug__cpuinitdata =-1 ; +int daddiu_bug =-1 ;static inline void check_daddiu (void ) {
arch/mips/kernel/cpu-probe.c +5 -5
@@ -544,7 +544,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) } } -static char unknown_isa[] __cpuinitdata = KERN_ERR \ +static char unknown_isa[] =KERN_ERR \"Unsupported ISA type, c0.config0: %d." ;static inline unsigned int decode_config0 (struct cpuinfo_mips *c)
@@ -650,7 +650,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)return config3 &MIPS_CONF_M ; } -static void __cpuinit decode_configs (struct cpuinfo_mips *c) +static void decode_configs (struct cpuinfo_mips *c) {/* MIPS32 or MIPS64 compliant CPU. */ c->options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER |
@@ -820,7 +820,7 @@ const char *__cpu_name[NR_CPUS];/* * Name a CPU */ -static __cpuinit const char *cpu_to_name (struct cpuinfo_mips *c) +static const char *cpu_to_name (struct cpuinfo_mips *c) {const char *name =NULL ;
@@ -903,7 +903,7 @@ static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c)return name; } -__cpuinit void cpu_probe (void ) +void cpu_probe (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int cpu =smp_processor_id ();
@@ -966,7 +966,7 @@ __cpuinit void cpu_probe(void) c->srsets =1 ; } -__cpuinit void cpu_report (void ) +void cpu_report (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;
arch/mips/kernel/smp-mt.c +3 -3
@@ -149,7 +149,7 @@ static void vsmp_send_ipi_mask(cpumask_t mask, unsigned int action)vsmp_send_ipi_single (i, action); } -static void __cpuinit vsmp_init_secondary (void ) +static void vsmp_init_secondary (void ) {extern int gic_present;
@@ -162,7 +162,7 @@ static void __cpuinit vsmp_init_secondary(void) STATUSF_IP6 | STATUSF_IP7); } -static void __cpuinit vsmp_smp_finish (void ) +static void vsmp_smp_finish (void ) {/* CDFIXME: remove this? */ write_c0_compare (read_c0_count () + (8 * mips_hpt_frequency/HZ ));
@@ -188,7 +188,7 @@ static void vsmp_cpus_done(void)* (unsigned long)idle->thread_info the gp * assumes a 1:1 mapping of TC => VPE */ -static void __cpuinit vsmp_boot_secondary (int cpu,struct task_struct *idle) +static void vsmp_boot_secondary (int cpu,struct task_struct *idle) {struct thread_info *gp =task_thread_info (idle);dvpe ();
arch/mips/kernel/smp-up.c +3 -3
@@ -27,11 +27,11 @@ static inline void up_send_ipi_mask(cpumask_t mask, unsigned int action)* After we've done initial boot, this function is called to allow the * board code to clean up state, if needed */ -void __cpuinit up_init_secondary (void ) +void up_init_secondary (void ) { } -void __cpuinit up_smp_finish (void ) +void up_smp_finish (void ) { }
@@ -43,7 +43,7 @@ void up_cpus_done(void)/* * Firmware CPU startup hook */ -void __cpuinit up_boot_secondary (int cpu,struct task_struct *idle) +void up_boot_secondary (int cpu,struct task_struct *idle) { }
arch/mips/kernel/smp.c +3 -3
@@ -85,7 +85,7 @@ static inline void set_cpu_sibling_map(int cpu)struct plat_smp_ops *mp_ops; -__cpuinit void register_smp_ops (struct plat_smp_ops *ops) +void register_smp_ops (struct plat_smp_ops *ops) {if (mp_ops)printk (KERN_WARNING "Overriding previously set SMP ops\n" );
@@ -97,7 +97,7 @@ __cpuinit void register_smp_ops(struct plat_smp_ops *ops)* First C code run on the secondary CPUs after being started up by * the master. */ -asmlinkage __cpuinit void start_secondary(void) +asmlinkage void start_secondary(void) {unsigned int cpu;
@@ -209,7 +209,7 @@ void __devinit smp_prepare_boot_cpu(void)* and keep control until "cpu_online(cpu)" is set. Note: cpu is * physical, not logical. */ -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {struct task_struct *idle;
arch/mips/kernel/smtc.c +1 -1
@@ -578,7 +578,7 @@ void smtc_prepare_cpus(int cpus)* (unsigned long)idle->thread_info the gp * */ -void __cpuinit smtc_boot_secondary (int cpu,struct task_struct *idle) +void smtc_boot_secondary (int cpu,struct task_struct *idle) {extern u32 kernelsp[NR_CPUS ];unsigned long flags;
arch/mips/kernel/spram.c +7 -7
@@ -39,7 +39,7 @@/* * Different semantics to the set_c0_* function built by __BUILD_SET_C0 */ -static __cpuinit unsigned int bis_c0_errctl (unsigned int set) +static unsigned int bis_c0_errctl (unsigned int set) {unsigned int res; res =read_c0_errctl ();
@@ -47,7 +47,7 @@ static __cpuinit unsigned int bis_c0_errctl(unsigned int set)return res; } -static __cpuinit void ispram_store_tag (unsigned int offset,unsigned int data) +static void ispram_store_tag (unsigned int offset,unsigned int data) {unsigned int errctl;
@@ -66,7 +66,7 @@ static __cpuinit void ispram_store_tag(unsigned int offset, unsigned int data) } -static __cpuinit unsigned int ispram_load_tag (unsigned int offset) +static unsigned int ispram_load_tag (unsigned int offset) {unsigned int data;unsigned int errctl;
@@ -84,7 +84,7 @@ static __cpuinit unsigned int ispram_load_tag(unsigned int offset)return data; } -static __cpuinit void dspram_store_tag (unsigned int offset,unsigned int data) +static void dspram_store_tag (unsigned int offset,unsigned int data) {unsigned int errctl;
@@ -100,7 +100,7 @@ static __cpuinit void dspram_store_tag(unsigned int offset, unsigned int data) } -static __cpuinit unsigned int dspram_load_tag (unsigned int offset) +static unsigned int dspram_load_tag (unsigned int offset) {unsigned int data;unsigned int errctl;
@@ -117,7 +117,7 @@ static __cpuinit unsigned int dspram_load_tag(unsigned int offset)return data; } -static __cpuinit void probe_spram (char *type, +static void probe_spram (char *type,unsigned int base,unsigned int (*read)(unsigned int ),void (*write)(unsigned int ,unsigned int ))
@@ -199,7 +199,7 @@ static __cpuinit void probe_spram(char *type, } } -__cpuinit void spram_config (void ) +void spram_config (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int config0;
arch/mips/kernel/time.c +1 -1
@@ -87,7 +87,7 @@ void __init clocksource_set_clock(struct clocksource *cs, unsigned int clock) cs->mult = (u32 ) temp; } -void __cpuinit clockevent_set_clock (struct clock_event_device *cd, +void clockevent_set_clock (struct clock_event_device *cd,unsigned int clock) {u64 temp;
arch/mips/kernel/traps.c +4 -4
@@ -1416,7 +1416,7 @@ int cp0_compare_irq;int cp0_perfcount_irq;EXPORT_SYMBOL_GPL (cp0_perfcount_irq); -static int __cpuinitdata noulri; +static int noulri;static int __init ulri_disable (char *s) {
@@ -1427,7 +1427,7 @@ static int __init ulri_disable(char *s) }__setup ("noulri" , ulri_disable); -void __cpuinit per_cpu_trap_init (void ) +void per_cpu_trap_init (void ) {unsigned int cpu =smp_processor_id ();unsigned int status_set =ST0_CU0 ;
@@ -1542,11 +1542,11 @@ void __init set_handler(unsigned long offset, void *addr, unsigned long size)local_flush_icache_range (ebase + offset, ebase + offset + size); } -static char panic_null_cerr[]__cpuinitdata = +static char panic_null_cerr[] ="Trying to set NULL cache error exception handler" ;/* Install uncached CPU exception handler */ -void __cpuinit set_uncached_handler (unsigned long offset,void *addr, +void set_uncached_handler (unsigned long offset,void *addr,unsigned long size) {#ifdef CONFIG_32BIT
arch/mips/kernel/watch.c +1 -1
@@ -100,7 +100,7 @@ void mips_clear_watch_registers(void) } } -__cpuinit void mips_probe_watch_registers (struct cpuinfo_mips *c) +void mips_probe_watch_registers (struct cpuinfo_mips *c) {unsigned int t;
arch/mips/lib/uncached.c +1 -1
@@ -36,7 +36,7 @@* values, so we can avoid sharing the same stack area between a cached * and the uncached mode. */ -unsigned long __cpuinit run_uncached (void *func) +unsigned long run_uncached (void *func) { registerlong sp __asm__("$sp" ); registerlong ret __asm__("$2" );
arch/mips/mipssim/sim_smtc.c +3 -3
@@ -54,7 +54,7 @@ static inline void ssmtc_send_ipi_mask(cpumask_t mask, unsigned int action)/* * Post-config but pre-boot cleanup entry point */ -static void __cpuinit ssmtc_init_secondary (void ) +static void ssmtc_init_secondary (void ) {void smtc_init_secondary (void );
@@ -64,7 +64,7 @@ static void __cpuinit ssmtc_init_secondary(void)/* * SMP initialization finalization entry point */ -static void __cpuinit ssmtc_smp_finish (void ) +static void ssmtc_smp_finish (void ) {smtc_smp_finish (); }
@@ -79,7 +79,7 @@ static void ssmtc_cpus_done(void)/* * Platform "CPU" startup hook */ -static void __cpuinit ssmtc_boot_secondary (int cpu,struct task_struct *idle) +static void ssmtc_boot_secondary (int cpu,struct task_struct *idle) {smtc_boot_secondary (cpu, idle); }
arch/mips/mipssim/sim_time.c +1 -1
@@ -83,7 +83,7 @@ static void mips_timer_dispatch(void) } -unsigned __cpuinit get_c0_compare_int (void ) +unsigned get_c0_compare_int (void ) {#ifdef MSC01E_INT_BASE if (cpu_has_veic) {
arch/mips/mm/c-r3k.c +4 -4
@@ -26,7 +26,7 @@static unsigned long icache_size, dcache_size;/* Size in bytes */ static unsigned long icache_lsize, dcache_lsize;/* Size in bytes */ -unsigned long __cpuinit r3k_cache_size (unsigned long ca_flags) +unsigned long r3k_cache_size (unsigned long ca_flags) {unsigned long flags, status, dummy, size;volatile unsigned long *p;
@@ -61,7 +61,7 @@ unsigned long __cpuinit r3k_cache_size(unsigned long ca_flags)return size *sizeof (*p); } -unsigned long __cpuinit r3k_cache_lsize (unsigned long ca_flags) +unsigned long r3k_cache_lsize (unsigned long ca_flags) {unsigned long flags, status, lsize, i;volatile unsigned long *p;
@@ -90,7 +90,7 @@ unsigned long __cpuinit r3k_cache_lsize(unsigned long ca_flags)return lsize *sizeof (*p); } -static void __cpuinit r3k_probe_cache (void ) +static void r3k_probe_cache (void ) { dcache_size =r3k_cache_size (ST0_ISC );if (dcache_size)
@@ -307,7 +307,7 @@ static void r3k_dma_cache_wback_inv(unsigned long start, unsigned long size)r3k_flush_dcache_range (start, start + size); } -void __cpuinit r3k_cache_init (void ) +void r3k_cache_init (void ) {extern void build_clear_page (void );extern void build_copy_page (void );
arch/mips/mm/c-r4k.c +17 -17
@@ -100,7 +100,7 @@ static inline void r4k_blast_dcache_page_dc32(unsigned long addr)blast_dcache32_page (addr); } -static void __cpuinit r4k_blast_dcache_page_setup (void ) +static void r4k_blast_dcache_page_setup (void ) {unsigned long dc_lsize =cpu_dcache_line_size ();
@@ -114,7 +114,7 @@ static void __cpuinit r4k_blast_dcache_page_setup(void)static void (* r4k_blast_dcache_page_indexed)(unsigned long addr); -static void __cpuinit r4k_blast_dcache_page_indexed_setup (void ) +static void r4k_blast_dcache_page_indexed_setup (void ) {unsigned long dc_lsize =cpu_dcache_line_size ();
@@ -128,7 +128,7 @@ static void __cpuinit r4k_blast_dcache_page_indexed_setup(void)static void (* r4k_blast_dcache)(void ); -static void __cpuinit r4k_blast_dcache_setup (void ) +static void r4k_blast_dcache_setup (void ) {unsigned long dc_lsize =cpu_dcache_line_size ();
@@ -213,7 +213,7 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page)static void (* r4k_blast_icache_page)(unsigned long addr); -static void __cpuinit r4k_blast_icache_page_setup (void ) +static void r4k_blast_icache_page_setup (void ) {unsigned long ic_lsize =cpu_icache_line_size ();
@@ -230,7 +230,7 @@ static void __cpuinit r4k_blast_icache_page_setup(void)static void (* r4k_blast_icache_page_indexed)(unsigned long addr); -static void __cpuinit r4k_blast_icache_page_indexed_setup (void ) +static void r4k_blast_icache_page_indexed_setup (void ) {unsigned long ic_lsize =cpu_icache_line_size ();
@@ -254,7 +254,7 @@ static void __cpuinit r4k_blast_icache_page_indexed_setup(void)static void (* r4k_blast_icache)(void ); -static void __cpuinit r4k_blast_icache_setup (void ) +static void r4k_blast_icache_setup (void ) {unsigned long ic_lsize =cpu_icache_line_size ();
@@ -275,7 +275,7 @@ static void __cpuinit r4k_blast_icache_setup(void)static void (* r4k_blast_scache_page)(unsigned long addr); -static void __cpuinit r4k_blast_scache_page_setup (void ) +static void r4k_blast_scache_page_setup (void ) {unsigned long sc_lsize =cpu_scache_line_size ();
@@ -293,7 +293,7 @@ static void __cpuinit r4k_blast_scache_page_setup(void)static void (* r4k_blast_scache_page_indexed)(unsigned long addr); -static void __cpuinit r4k_blast_scache_page_indexed_setup (void ) +static void r4k_blast_scache_page_indexed_setup (void ) {unsigned long sc_lsize =cpu_scache_line_size ();
@@ -311,7 +311,7 @@ static void __cpuinit r4k_blast_scache_page_indexed_setup(void)static void (* r4k_blast_scache)(void ); -static void __cpuinit r4k_blast_scache_setup (void ) +static void r4k_blast_scache_setup (void ) {unsigned long sc_lsize =cpu_scache_line_size ();
@@ -718,11 +718,11 @@ static inline void rm7k_erratum31(void) } } -static char *way_string[]__cpuinitdata = {NULL ,"direct mapped" ,"2-way" , +static char *way_string[] = {NULL ,"direct mapped" ,"2-way" ,"3-way" ,"4-way" ,"5-way" ,"6-way" ,"7-way" ,"8-way" }; -static void __cpuinit probe_pcache (void ) +static void probe_pcache (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int config =read_c0_config ();
@@ -1044,7 +1044,7 @@ static void __cpuinit probe_pcache(void)* executes in KSEG1 space or else you will crash and burn badly. You have * been warned. */ -static int __cpuinit probe_scache (void ) +static int probe_scache (void ) {unsigned long flags, addr, begin, end, pow2;unsigned int config =read_c0_config ();
@@ -1123,7 +1123,7 @@ extern int r5k_sc_init(void);extern int rm7k_sc_init (void );extern int mips_sc_init (void ); -static void __cpuinit setup_scache (void ) +static void setup_scache (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int config =read_c0_config ();
@@ -1256,7 +1256,7 @@ static void nxp_pr4450_fixup_config(void)NXP_BARRIER (); } -static int __cpuinitdata cca =-1 ; +static int cca =-1 ;static int __init cca_setup (char *str) {
@@ -1267,7 +1267,7 @@ static int __init cca_setup(char *str)__setup ("cca=" , cca_setup); -static void __cpuinit coherency_setup (void ) +static void coherency_setup (void ) {if (cca <0 || cca >7 ) cca =read_c0_config () &CONF_CM_CMASK ;
@@ -1310,7 +1310,7 @@ static void __cpuinit coherency_setup(void)#if defined(CONFIG_DMA_NONCOHERENT ) -static int __cpuinitdata coherentio; +static int coherentio;static int __init setcoherentio (char *str) {
@@ -1322,7 +1322,7 @@ static int __init setcoherentio(char *str)__setup ("coherentio" , setcoherentio);#endif -void __cpuinit r4k_cache_init (void ) +void r4k_cache_init (void ) {extern void build_clear_page (void );extern void build_copy_page (void );
arch/mips/mm/c-tx39.c +1 -1
@@ -339,7 +339,7 @@ static __init void tx39_probe_cache(void) } } -void __cpuinit tx39_cache_init (void ) +void tx39_cache_init (void ) {extern void build_clear_page (void );extern void build_copy_page (void );
arch/mips/mm/page.c +20 -20
@@ -65,8 +65,8 @@ UASM_L_LA(_copy_pref_both)UASM_L_LA (_copy_pref_store)/* We need one branch and therefore one relocation per target label. */ -static struct uasm_label __cpuinitdata labels[5]; -static struct uasm_reloc __cpuinitdata relocs[5 ]; +static struct uasm_label labels[5]; +static struct uasm_reloc relocs[5 ];#define cpu_is_r4600_v1_x () ((read_c0_prid() & 0xfffffff0) == 0x00002010)#define cpu_is_r4600_v2_x () ((read_c0_prid() & 0xfffffff0) == 0x00002020)
@@ -110,23 +110,23 @@ void copy_page(void *to, void *from) __attribute__((alias("copy_page_array")));EXPORT_SYMBOL (copy_page); -static int pref_bias_clear_store__cpuinitdata ; -static int pref_bias_copy_load__cpuinitdata ; -static int pref_bias_copy_store__cpuinitdata ; +static int pref_bias_clear_store; +static int pref_bias_copy_load; +static int pref_bias_copy_store; -static u32 pref_src_mode__cpuinitdata ; -static u32 pref_dst_mode__cpuinitdata ; +static u32 pref_src_mode; +static u32 pref_dst_mode; -static int clear_word_size__cpuinitdata ; -static int copy_word_size__cpuinitdata ; +static int clear_word_size; +static int copy_word_size; -static int half_clear_loop_size__cpuinitdata ; -static int half_copy_loop_size__cpuinitdata ; +static int half_clear_loop_size; +static int half_copy_loop_size; -static int cache_line_size__cpuinitdata ; +static int cache_line_size;#define cache_line_mask () (cache_line_size - 1) -static inline void __cpuinit +static inline void pg_addiu (u32 **buf,unsigned int reg1,unsigned int reg2,unsigned int off) {if (cpu_has_64bit_gp_regs &&DADDI_WAR &&r4k_daddiu_bug ()) {
@@ -146,7 +146,7 @@ pg_addiu(u32 **buf, unsigned int reg1, unsigned int reg2, unsigned int off) } } -static void __cpuinit set_prefetch_parameters (void ) +static void set_prefetch_parameters (void ) {if (cpu_has_64bit_gp_regs || cpu_has_64bit_zero_reg) clear_word_size =8 ;
@@ -245,7 +245,7 @@ static void __cpuinit set_prefetch_parameters(void) 4 * copy_word_size)); } -static void __cpuinit build_clear_store (u32 **buf,int off) +static void build_clear_store (u32 **buf,int off) {if (cpu_has_64bit_gp_regs || cpu_has_64bit_zero_reg) {uasm_i_sd (buf,ZERO , off,A0 );
@@ -254,7 +254,7 @@ static void __cpuinit build_clear_store(u32 **buf, int off) } } -static inline void __cpuinit build_clear_pref (u32 **buf,int off) +static inline void build_clear_pref (u32 **buf,int off) {if (off &cache_line_mask ())return ;
@@ -281,7 +281,7 @@ static inline void __cpuinit build_clear_pref(u32 **buf, int off) } } -void __cpuinit build_clear_page (void ) +void build_clear_page (void ) {int off;u32 *buf = (u32 *)&clear_page_array;
@@ -369,7 +369,7 @@ void __cpuinit build_clear_page(void)pr_debug ("\t.set pop\n" ); } -static void __cpuinit build_copy_load (u32 **buf,int reg,int off) +static void build_copy_load (u32 **buf,int reg,int off) {if (cpu_has_64bit_gp_regs) {uasm_i_ld (buf, reg, off,A1 );
@@ -378,7 +378,7 @@ static void __cpuinit build_copy_load(u32 **buf, int reg, int off) } } -static void __cpuinit build_copy_store (u32 **buf,int reg,int off) +static void build_copy_store (u32 **buf,int reg,int off) {if (cpu_has_64bit_gp_regs) {uasm_i_sd (buf, reg, off,A0 );
@@ -423,7 +423,7 @@ static inline void build_copy_store_pref(u32 **buf, int off) } } -void __cpuinit build_copy_page (void ) +void build_copy_page (void ) {int off;u32 *buf = (u32 *)©_page_array;
arch/mips/mm/sc-ip22.c +1 -1
@@ -168,7 +168,7 @@ struct bcache_ops indy_sc_ops = { .bc_inv = indy_sc_wback_invalidate }; -void __cpuinit indy_sc_init (void ) +void indy_sc_init (void ) {if (indy_sc_probe ()) {indy_sc_enable ();
arch/mips/mm/sc-mips.c +1 -1
@@ -100,7 +100,7 @@ static inline int __init mips_sc_probe(void)return 1 ; } -int __cpuinit mips_sc_init (void ) +int mips_sc_init (void ) {int found =mips_sc_probe ();if (found) {
arch/mips/mm/sc-r5k.c +1 -1
@@ -99,7 +99,7 @@ static struct bcache_ops r5k_sc_ops = { .bc_inv = r5k_dma_cache_inv_sc }; -void __cpuinit r5k_sc_init (void ) +void r5k_sc_init (void ) {if (r5k_sc_probe ()) {r5k_sc_enable ();
arch/mips/mm/sc-rm7k.c +3 -3
@@ -86,7 +86,7 @@ static void rm7k_sc_inv(unsigned long addr, unsigned long size)/* * This function is executed in uncached address space. */ -static __cpuinit void __rm7k_sc_enable (void ) +static void __rm7k_sc_enable (void ) {int i;
@@ -107,7 +107,7 @@ static __cpuinit void __rm7k_sc_enable(void) } } -static __cpuinit void rm7k_sc_enable (void ) +static void rm7k_sc_enable (void ) {if (read_c0_config () &RM7K_CONF_SE )return ;
@@ -128,7 +128,7 @@ struct bcache_ops rm7k_sc_ops = { .bc_inv = rm7k_sc_inv }; -void __cpuinit rm7k_sc_init (void ) +void rm7k_sc_init (void ) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int config =read_c0_config ();
arch/mips/mm/tlb-r3k.c +1 -1
@@ -277,7 +277,7 @@ void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1, } } -void __cpuinit tlb_init (void ) +void tlb_init (void ) {local_flush_tlb_all ();
arch/mips/mm/tlb-r4k.c +4 -4
@@ -388,7 +388,7 @@ void __init add_wired_entry(unsigned long entrylo0, unsigned long entrylo1,* lifetime of the system */ -static int temp_tlb_entry__cpuinitdata ; +static int temp_tlb_entry;__init int add_temporary_entry (unsigned long entrylo0,unsigned long entrylo1,unsigned long entryhi,unsigned long pagemask)
@@ -427,7 +427,7 @@ out:return ret; } -static void __cpuinit probe_tlb (unsigned long config) +static void probe_tlb (unsigned long config) {struct cpuinfo_mips *c = ¤t_cpu_data;unsigned int reg;
@@ -455,7 +455,7 @@ static void __cpuinit probe_tlb(unsigned long config) c->tlbsize = ((reg >>25 ) &0x3f ) +1 ; } -static int __cpuinitdata ntlb =0 ; +static int ntlb =0 ;static int __init set_ntlb (char *str) {get_option (&str, &ntlb);
@@ -464,7 +464,7 @@ static int __init set_ntlb(char *str)__setup ("ntlb=" , set_ntlb); -void __cpuinit tlb_init (void ) +void tlb_init (void ) {unsigned int config =read_c0_config ();
arch/mips/mm/tlb-r8k.c +2 -2
@@ -214,14 +214,14 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)local_irq_restore (flags); } -static void __cpuinit probe_tlb (unsigned long config) +static void probe_tlb (unsigned long config) {struct cpuinfo_mips *c = ¤t_cpu_data; c->tlbsize =3 *128 ;/* 3 sets each 128 entries */ } -void __cpuinit tlb_init (void ) +void tlb_init (void ) {unsigned int config =read_c0_config ();unsigned long status;
arch/mips/mm/tlbex.c +35 -35
268 lines not on this page · raw message
arch/mips/mm/uasm.c +35 -35
276 lines not on this page · raw message
arch/mips/mm/uasm.h +12 -12
@@ -11,38 +11,38 @@#include <linux/types.h> #define Ip_u1u2u3 (op) \ -void __cpuinit \ +void \ uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)#define Ip_u2u1u3 (op) \ -void __cpuinit \ +void \ uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)#define Ip_u3u1u2 (op) \ -void __cpuinit \ +void \ uasm_i##op(u32 **buf, unsigned int a, unsigned int b, unsigned int c)#define Ip_u1u2s3 (op) \ -void __cpuinit \ +void \ uasm_i##op(u32 **buf, unsigned int a, unsigned int b, signed int c)#define Ip_u2s3u1 (op) \ -void __cpuinit \ +void \ uasm_i##op(u32 **buf, unsigned int a, signed int b, unsigned int c)#define Ip_u2u1s3 (op) \ -void __cpuinit \ +void \ uasm_i##op(u32 **buf, unsigned int a, unsigned int b, signed int c)#define Ip_u1u2 (op) \ -void __cpuinit uasm_i##op(u32 **buf, unsigned int a, unsigned int b) +void uasm_i##op(u32 **buf, unsigned int a, unsigned int b)#define Ip_u1s2 (op) \ -void __cpuinit uasm_i##op(u32 **buf, unsigned int a, signed int b) +void uasm_i##op(u32 **buf, unsigned int a, signed int b) -#define Ip_u1 (op) void __cpuinit uasm_i##op(u32 **buf, unsigned int a) +#define Ip_u1 (op) void uasm_i##op(u32 **buf, unsigned int a) -#define Ip_0 (op) void __cpuinit uasm_i##op(u32 **buf) +#define Ip_0 (op) void uasm_i##op(u32 **buf)Ip_u2u1s3 (_addiu);Ip_u3u1u2 (_addu);
@@ -100,7 +100,7 @@ struct uasm_label {int lab; }; -void __cpuinit uasm_build_label (struct uasm_label **lab,u32 *addr,int lid); +void uasm_build_label (struct uasm_label **lab,u32 *addr,int lid);#ifdef CONFIG_64BIT int uasm_in_compat_space_p (long addr);#endif
@@ -110,7 +110,7 @@ void UASM_i_LA_mostly(u32 **buf, unsigned int rs, long addr);void UASM_i_LA (u32 **buf,unsigned int rs,long addr);#define UASM_L_LA (lb) \ -static inline void __cpuinit uasm_l##lb(struct uasm_label **lab, u32 *addr) \ +static inline void uasm_l##lb(struct uasm_label **lab, u32 *addr) \ { \ uasm_build_label(lab, addr, label##lb); \ }
arch/mips/mti-malta/malta-smtc.c +3 -3
@@ -32,7 +32,7 @@ static void msmtc_send_ipi_mask(cpumask_t mask, unsigned int action)/* * Post-config but pre-boot cleanup entry point */ -static void __cpuinit msmtc_init_secondary (void ) +static void msmtc_init_secondary (void ) {void smtc_init_secondary (void );int myvpe;
@@ -54,7 +54,7 @@ static void __cpuinit msmtc_init_secondary(void)/* * Platform "CPU" startup hook */ -static void __cpuinit msmtc_boot_secondary (int cpu,struct task_struct *idle) +static void msmtc_boot_secondary (int cpu,struct task_struct *idle) {smtc_boot_secondary (cpu, idle); }
@@ -62,7 +62,7 @@ static void __cpuinit msmtc_boot_secondary(int cpu, struct task_struct *idle)/* * SMP initialization finalization entry point */ -static void __cpuinit msmtc_smp_finish (void ) +static void msmtc_smp_finish (void ) {smtc_smp_finish (); }
arch/mips/mti-malta/malta-time.c +1 -1
@@ -123,7 +123,7 @@ static void __init plat_perf_setup(void) } } -unsigned int __cpuinit get_c0_compare_int (void ) +unsigned int get_c0_compare_int (void ) {#ifdef MSC01E_INT_BASE if (cpu_has_veic) {
arch/mips/pci/pci-ip27.c +1 -1
@@ -40,7 +40,7 @@ int irq_to_slot[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS];extern struct pci_ops bridge_pci_ops; -int __cpuinit bridge_probe (nasid_t nasid,int widget_id,int masterwid) +int bridge_probe (nasid_t nasid,int widget_id,int masterwid) {unsigned long offset =NODE_OFFSET (nasid);struct bridge_controller *bc;
arch/mips/pmc-sierra/yosemite/smp.c +6 -6
@@ -7,10 +7,10 @@#define LAUNCHSTACK_SIZE 256 -static __cpuinitdata DEFINE_SPINLOCK (launch_lock); +static DEFINE_SPINLOCK (launch_lock); -static unsigned long secondary_sp__cpuinitdata ; -static unsigned long secondary_gp__cpuinitdata ; +static unsigned long secondary_sp; +static unsigned long secondary_gp; static unsigned char launchstack[LAUNCHSTACK_SIZE] __initdata __attribute__((aligned(2 * sizeof(long))));
@@ -108,12 +108,12 @@ static void yos_send_ipi_mask(cpumask_t mask, unsigned int action)* After we've done initial boot, this function is called to allow the * board code to clean up state, if needed */ -static void __cpuinit yos_init_secondary (void ) +static void yos_init_secondary (void ) {set_c0_status (ST0_CO |ST0_IE |ST0_IM ); } -static void __cpuinit yos_smp_finish (void ) +static void yos_smp_finish (void ) { }
@@ -129,7 +129,7 @@ static void yos_cpus_done(void)* stack so the first thing we do is throw away that stuff and load useful * values into the registers ... */ -static void __cpuinit yos_boot_secondary (int cpu,struct task_struct *idle) +static void yos_boot_secondary (int cpu,struct task_struct *idle) {unsigned long gp = (unsigned long )task_thread_info (idle);unsigned long sp =__KSTK_TOS (idle);
arch/mips/sgi-ip27/ip27-init.c +2 -2
@@ -53,7 +53,7 @@ extern void pcibr_setup(cnodeid_t);extern void xtalk_probe_node (cnodeid_t nid); -static void __cpuinit per_hub_init (cnodeid_t cnode) +static void per_hub_init (cnodeid_t cnode) {struct hub_data *hub =hub_data (cnode);nasid_t nasid =COMPACT_TO_NASID_NODEID (cnode);
@@ -109,7 +109,7 @@ static void __cpuinit per_hub_init(cnodeid_t cnode) } } -void __cpuinit per_cpu_init (void ) +void per_cpu_init (void ) {int cpu =smp_processor_id ();int slice =LOCAL_HUB_L (PI_CPU_NUM );
arch/mips/sgi-ip27/ip27-smp.c +3 -3
@@ -173,12 +173,12 @@ static void ip27_send_ipi_mask(cpumask_t mask, unsigned int action)ip27_send_ipi_single (i, action); } -static void __cpuinit ip27_init_secondary (void ) +static void ip27_init_secondary (void ) {per_cpu_init (); } -static void __cpuinit ip27_smp_finish (void ) +static void ip27_smp_finish (void ) {extern void hub_rt_clock_event_init (void );
@@ -195,7 +195,7 @@ static void __init ip27_cpus_done(void)* set sp to the kernel stack of the newly created idle process, gp to the proc * struct so that current_thread_info() will work. */ -static void __cpuinit ip27_boot_secondary (int cpu,struct task_struct *idle) +static void ip27_boot_secondary (int cpu,struct task_struct *idle) {unsigned long gp = (unsigned long )task_thread_info (idle);unsigned long sp =__KSTK_TOS (idle);
arch/mips/sgi-ip27/ip27-timer.c +3 -3
@@ -119,7 +119,7 @@ struct irqaction hub_rt_irqaction = {#define NSEC_PER_CYCLE 800#define CYCLES_PER_SEC (NSEC_PER_SEC / NSEC_PER_CYCLE) -void __cpuinit hub_rt_clock_event_init (void ) +void hub_rt_clock_event_init (void ) {unsigned int cpu =smp_processor_id ();struct clock_event_device *cd = &per_cpu (hub_rt_clockevent, cpu);
@@ -187,7 +187,7 @@ void __init plat_time_init(void)hub_rt_clock_event_init (); } -void __cpuinit cpu_time_init (void ) +void cpu_time_init (void ) {lboard_t *board;klcpu_t *cpu;
@@ -208,7 +208,7 @@ void __cpuinit cpu_time_init(void)set_c0_status (SRB_TIMOCLK ); } -void __cpuinit hub_rtc_init (cnodeid_t cnode) +void hub_rtc_init (cnodeid_t cnode) {/*
arch/mips/sgi-ip27/ip27-xtalk.c +3 -3
@@ -22,7 +22,7 @@extern int bridge_probe (nasid_t nasid,int widget,int masterwid); -static int __cpuinit probe_one_port (nasid_t nasid,int widget,int masterwid) +static int probe_one_port (nasid_t nasid,int widget,int masterwid) {widgetreg_t widget_id;xwidget_part_num_t partnum;
@@ -46,7 +46,7 @@ static int __cpuinit probe_one_port(nasid_t nasid, int widget, int masterwid)return 0 ; } -static int __cpuinit xbow_probe (nasid_t nasid) +static int xbow_probe (nasid_t nasid) {lboard_t *brd;klxbow_t *xbow_p;
@@ -99,7 +99,7 @@ static int __cpuinit xbow_probe(nasid_t nasid)return 0 ; } -void __cpuinit xtalk_probe_node (cnodeid_t nid) +void xtalk_probe_node (cnodeid_t nid) {volatile u64 hubreg;nasid_t nasid;
arch/mips/sibyte/bcm1480/smp.c +4 -4
@@ -59,7 +59,7 @@ static void *mailbox_0_regs[] = {/* * SMP init and finish on secondary CPUs */ -void __cpuinit bcm1480_smp_init (void ) +void bcm1480_smp_init (void ) {unsigned int imask =STATUSF_IP4 |STATUSF_IP3 |STATUSF_IP2 |STATUSF_IP1 |STATUSF_IP0 ;
@@ -93,7 +93,7 @@ static void bcm1480_send_ipi_mask(cpumask_t mask, unsigned int action)/* * Code to run on secondary just after probing the CPU */ -static void __cpuinit bcm1480_init_secondary (void ) +static void bcm1480_init_secondary (void ) {extern void bcm1480_smp_init (void );
@@ -104,7 +104,7 @@ static void __cpuinit bcm1480_init_secondary(void)* Do any tidying up before marking online and running the idle * loop */ -static void __cpuinit bcm1480_smp_finish (void ) +static void bcm1480_smp_finish (void ) {extern void sb1480_clockevent_init (void );
@@ -123,7 +123,7 @@ static void bcm1480_cpus_done(void)* Setup the PC, SP, and GP of a secondary processor and start it * running! */ -static void __cpuinit bcm1480_boot_secondary (int cpu,struct task_struct *idle) +static void bcm1480_boot_secondary (int cpu,struct task_struct *idle) {int retval;
arch/mips/sibyte/sb1250/smp.c +4 -4
@@ -47,7 +47,7 @@ static void *mailbox_regs[] = {/* * SMP init and finish on secondary CPUs */ -void __cpuinit sb1250_smp_init (void ) +void sb1250_smp_init (void ) {unsigned int imask =STATUSF_IP4 |STATUSF_IP3 |STATUSF_IP2 |STATUSF_IP1 |STATUSF_IP0 ;
@@ -81,7 +81,7 @@ static inline void sb1250_send_ipi_mask(cpumask_t mask, unsigned int action)/* * Code to run on secondary just after probing the CPU */ -static void __cpuinit sb1250_init_secondary (void ) +static void sb1250_init_secondary (void ) {extern void sb1250_smp_init (void );
@@ -92,7 +92,7 @@ static void __cpuinit sb1250_init_secondary(void)* Do any tidying up before marking online and running the idle * loop */ -static void __cpuinit sb1250_smp_finish (void ) +static void sb1250_smp_finish (void ) {extern void sb1250_clockevent_init (void );
@@ -111,7 +111,7 @@ static void sb1250_cpus_done(void)* Setup the PC, SP, and GP of a secondary processor and start it * running! */ -static void __cpuinit sb1250_boot_secondary (int cpu,struct task_struct *idle) +static void sb1250_boot_secondary (int cpu,struct task_struct *idle) {int retval;
arch/parisc/kernel/hardware.c +1 -1
@@ -1366,7 +1366,7 @@ parisc_hardware_description(struct parisc_device_id *id)/* Interpret hversion (ret[0]) from PDC_MODEL(4)/PDC_MODEL_INFO(0) */ -enum cpu_type __cpuinit +enum cpu_type parisc_get_cpu_type (unsigned long hversion) {struct hp_cpu_type_mask *ptr;
arch/parisc/kernel/processor.c +1 -1
@@ -76,7 +76,7 @@ extern int update_cr16_clocksource(void); /* from time.c */* (return 1). If so, initialize the chip and tell other partners in crime * they have work to do. */ -static int __cpuinit processor_probe (struct parisc_device *dev) +static int processor_probe (struct parisc_device *dev) {unsigned long txn_addr;unsigned long cpuid;
arch/parisc/kernel/smp.c +2 -2
@@ -358,7 +358,7 @@ void __init smp_callin(void)/* * Bring one cpu online. */ -int __cpuinit smp_boot_one_cpu (int cpuid) +int smp_boot_one_cpu (int cpuid) {struct task_struct *idle;long timeout;
@@ -468,7 +468,7 @@ void smp_cpus_done(unsigned int cpu_max) } -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {if (cpu !=0 && cpu < parisc_max_cpus)smp_boot_one_cpu (cpu);
arch/powerpc/kernel/smp.c +1 -1
@@ -316,7 +316,7 @@ static int __devinit cpu_enable(unsigned int cpu)return -ENOSYS ; } -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {int c;
arch/powerpc/kernel/sysfs.c +6 -6
@@ -481,7 +481,7 @@ static struct cache_desc_info icache_info = { .nr_sets_prop = "i-cache-sets", }; -static struct cache_desc *__cpuinit create_cache_desc (struct device_node *np,struct kobject *parent,int index,int level,struct cache_desc_info *info) +static struct cache_desc *create_cache_desc (struct device_node *np,struct kobject *parent,int index,int level,struct cache_desc_info *info) {const u32 *cache_line_size;struct cache_desc *new;
@@ -564,7 +564,7 @@ static bool cache_is_unified(struct device_node *np)return of_get_property (np,"cache-unified" ,NULL ); } -static struct cache_desc *__cpuinit create_cache_index_info (struct device_node *np,struct kobject *parent,int index,int level) +static struct cache_desc *create_cache_index_info (struct device_node *np,struct kobject *parent,int index,int level) {const phandle *next_cache_phandle;struct device_node *next_cache;
@@ -606,7 +606,7 @@ out:return new; } -static void __cpuinit create_cache_info (struct sys_device *sysdev) +static void create_cache_info (struct sys_device *sysdev) {struct kobject *cache_toplevel;struct device_node *np =NULL ;
@@ -625,7 +625,7 @@ static void __cpuinit create_cache_info(struct sys_device *sysdev)return ; } -static void __cpuinit register_cpu_online (unsigned int cpu) +static void register_cpu_online (unsigned int cpu) {struct cpu *c = &per_cpu (cpu_devices, cpu);struct sys_device *s = &c->sysdev;
@@ -776,7 +776,7 @@ static void unregister_cpu_online(unsigned int cpu) }#endif /* CONFIG_HOTPLUG_CPU */ -static int __cpuinit sysfs_cpu_notify (struct notifier_block *self, +static int sysfs_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) {unsigned int cpu = (unsigned int )(long )hcpu;
@@ -796,7 +796,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,return NOTIFY_OK ; } -static struct notifier_block __cpuinitdata sysfs_cpu_nb = { +static struct notifier_block sysfs_cpu_nb = { .notifier_call = sysfs_cpu_notify, };
arch/powerpc/mm/numa.c +6 -6
@@ -42,7 +42,7 @@ EXPORT_SYMBOL(node_data);static int min_common_depth;static int n_mem_addr_cells, n_mem_size_cells; -static int __cpuinit fake_numa_create_new_node (unsigned long end_pfn, +static int fake_numa_create_new_node (unsigned long end_pfn,unsigned int *nid) {unsigned long long mem;
@@ -129,7 +129,7 @@ static void __init get_node_active_region(unsigned long start_pfn,work_with_active_regions (nid, get_active_region_work_fn, node_ar); } -static void __cpuinit map_cpu_to_node (int cpu,int node) +static void map_cpu_to_node (int cpu,int node) { numa_cpu_lookup_table[cpu] = node;
@@ -155,7 +155,7 @@ static void unmap_cpu_from_node(unsigned long cpu) }#endif /* CONFIG_HOTPLUG_CPU */ -static struct device_node *__cpuinit find_cpu_node (unsigned int cpu) +static struct device_node *find_cpu_node (unsigned int cpu) {unsigned int hw_cpuid =get_hard_smp_processor_id (cpu);struct device_node *cpu_node =NULL ;
@@ -464,7 +464,7 @@ static int of_drconf_to_nid_single(struct of_drconf_cell *drmem,* Figure out to which domain a cpu belongs and stick it there. * Return the id of the domain used. */ -static int __cpuinit numa_setup_cpu (unsigned long lcpu) +static int numa_setup_cpu (unsigned long lcpu) {int nid =0 ;struct device_node *cpu =find_cpu_node (lcpu);
@@ -486,7 +486,7 @@ out:return nid; } -static int __cpuinit cpu_numa_callback (struct notifier_block *nfb, +static int cpu_numa_callback (struct notifier_block *nfb,unsigned long action,void *hcpu) {
@@ -860,7 +860,7 @@ static void __init *careful_allocation(int nid, unsigned long size,return (void *)ret; } -static struct notifier_block __cpuinitdata ppc64_numa_nb = { +static struct notifier_block ppc64_numa_nb = { .notifier_call = cpu_numa_callback, .priority =1 /* Must run before sched domains notifier. */ };
arch/s390/appldata/appldata_base.c +4 -4
@@ -475,7 +475,7 @@ void appldata_unregister_ops(struct appldata_ops *ops)/******************************* init / exit *********************************/ -static void __cpuinit appldata_online_cpu (int cpu) +static void appldata_online_cpu (int cpu) {init_virt_timer (&per_cpu (appldata_timer, cpu));per_cpu (appldata_timer, cpu).function = appldata_timer_function;
@@ -487,7 +487,7 @@ static void __cpuinit appldata_online_cpu(int cpu)spin_unlock (&appldata_timer_lock); } -static void __cpuinit appldata_offline_cpu (int cpu) +static void appldata_offline_cpu (int cpu) {del_virt_timer (&per_cpu (appldata_timer, cpu));if (atomic_dec_and_test (&appldata_expire_count)) {
@@ -499,7 +499,7 @@ static void __cpuinit appldata_offline_cpu(int cpu)spin_unlock (&appldata_timer_lock); } -static int __cpuinit appldata_cpu_notify (struct notifier_block *self, +static int appldata_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) {
@@ -518,7 +518,7 @@ static int __cpuinit appldata_cpu_notify(struct notifier_block *self,return NOTIFY_OK ; } -static struct notifier_block __cpuinitdata appldata_nb = { +static struct notifier_block appldata_nb = { .notifier_call = appldata_cpu_notify, };
arch/s390/kernel/entry.h +1 -1
@@ -20,7 +20,7 @@ int handle_signal32(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs);void do_extint (struct pt_regs *regs,unsigned short code); -int __cpuinit start_secondary (void *cpuvoid); +int start_secondary (void *cpuvoid);void __init startup_init (void );void die (const char * str,struct pt_regs * regs,long err);
arch/s390/kernel/setup.c +2 -2
@@ -103,7 +103,7 @@ static struct resource data_resource = {/* * cpu_init() initializes state that is per-CPU. */ -void __cpuinit cpu_init (void ) +void cpu_init (void ) {int addr =hard_smp_processor_id ();
@@ -819,7 +819,7 @@ setup_arch(char **cmdline_p)setup_zfcpdump (console_devno); } -void __cpuinit print_cpu_info (struct cpuinfo_S390 *cpuinfo) +void print_cpu_info (struct cpuinfo_S390 *cpuinfo) { printk(KERN_INFO "cpu %d "#ifdef CONFIG_SMP
arch/s390/kernel/smp.c +5 -5
@@ -571,7 +571,7 @@ out:/* * Activate a secondary processor. */ -int __cpuinit start_secondary (void *cpuvoid) +int start_secondary (void *cpuvoid) {/* Setup the cpu */ cpu_init ();
@@ -614,7 +614,7 @@ static void __init smp_create_idle(unsigned int cpu) current_set[cpu] = p; } -static int __cpuinit smp_alloc_lowcore (int cpu) +static int smp_alloc_lowcore (int cpu) {unsigned long async_stack, panic_stack;struct _lowcore *lowcore;
@@ -676,7 +676,7 @@ static void smp_free_lowcore(int cpu)#endif /* CONFIG_HOTPLUG_CPU */ /* Upping and downing of CPUs */ -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {struct task_struct *idle;struct _lowcore *cpu_lowcore;
@@ -1031,7 +1031,7 @@ static struct attribute_group cpu_online_attr_group = { .attrs = cpu_online_attrs, }; -static int __cpuinit smp_cpu_notify (struct notifier_block *self, +static int smp_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) {unsigned int cpu = (unsigned int )(long )hcpu;
@@ -1059,7 +1059,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,return NOTIFY_OK ; } -static struct notifier_block __cpuinitdata smp_cpu_nb = { +static struct notifier_block smp_cpu_nb = { .notifier_call = smp_cpu_notify, };
arch/sh/kernel/smp.c +2 -2
@@ -67,7 +67,7 @@ void __devinit smp_prepare_boot_cpu(void)cpu_set (cpu, cpu_possible_map); } -asmlinkage void __cpuinit start_secondary(void) +asmlinkage void start_secondary(void) {unsigned int cpu;struct mm_struct *mm = &init_mm;
@@ -105,7 +105,7 @@ extern struct {void *thread_info; } stack_start; -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {struct task_struct *tsk;unsigned long timeout;
arch/sh/kernel/traps_32.c +1 -1
@@ -793,7 +793,7 @@ static inline void __init gdb_vbr_init(void) }#endif -void __cpuinit per_cpu_trap_init (void ) +void per_cpu_trap_init (void ) {extern void *vbr_base;
arch/sparc/kernel/smp.c +4 -4
@@ -51,7 +51,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_NONE;* instruction which is much better... */ -void __cpuinit smp_store_cpu_info (int id) +void smp_store_cpu_info (int id) {int cpu_node;
@@ -357,10 +357,10 @@ void __init smp_prepare_boot_cpu(void)cpu_set (cpuid, phys_cpu_present_map); } -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) { -extern int __cpuinit smp4m_boot_one_cpu (int ); -extern int __cpuinit smp4d_boot_one_cpu (int ); +extern int smp4m_boot_one_cpu (int ); +extern int smp4d_boot_one_cpu (int );int ret=0 ;switch (sparc_cpu_model) {
arch/sparc/kernel/sun4d_smp.c +1 -1
@@ -174,7 +174,7 @@ void __init smp4d_boot_cpus(void)local_flush_cache_all (); } -int __cpuinit smp4d_boot_one_cpu (int i) +int smp4d_boot_one_cpu (int i) {extern unsigned long sun4d_cpu_startup;unsigned long *entry = &sun4d_cpu_startup;
arch/sparc/kernel/sun4m_smp.c +2 -2
@@ -65,7 +65,7 @@ static inline unsigned long swap(volatile unsigned long *ptr, unsigned long val)static void smp_setup_percpu_timer (void );extern void cpu_probe (void ); -void __cpuinit smp4m_callin (void ) +void smp4m_callin (void ) {int cpuid =hard_smp_processor_id ();
@@ -130,7 +130,7 @@ void __init smp4m_boot_cpus(void)local_flush_cache_all (); } -int __cpuinit smp4m_boot_one_cpu (int i) +int smp4m_boot_one_cpu (int i) {extern unsigned long sun4m_cpu_startup;unsigned long *entry = &sun4m_cpu_startup;
arch/sparc64/kernel/ds.c +2 -2
@@ -525,7 +525,7 @@ static void dr_cpu_mark(struct ds_data *resp, int cpu, int ncpus, } } -static int __cpuinit dr_cpu_configure (struct ds_info *dp, +static int dr_cpu_configure (struct ds_info *dp,struct ds_cap_state *cp,u64 req_num,cpumask_t *mask)
@@ -623,7 +623,7 @@ static int dr_cpu_unconfigure(struct ds_info *dp,return 0 ; } -static void __cpuinit dr_cpu_data (struct ds_info *dp, +static void dr_cpu_data (struct ds_info *dp,struct ds_cap_state *cp,void *buf,int len) {
arch/sparc64/kernel/entry.h +1 -1
@@ -190,6 +190,6 @@ extern unsigned long ivector_table_pa;extern void handler_irq (int irq,struct pt_regs *regs);extern void init_irqwork_curcpu (void ); -extern void __cpuinit sun4v_register_mondo_queues (int this_cpu); +extern void sun4v_register_mondo_queues (int this_cpu);#endif /* _ENTRY_H */
arch/sparc64/kernel/irq.c +2 -2
@@ -884,7 +884,7 @@ void notrace init_irqwork_curcpu(void)* Therefore you cannot make any OBP calls, not even prom_printf, * from these two routines. */ -static void __cpuinit register_one_mondo (unsigned long paddr,unsigned long type,unsigned long qmask) +static void register_one_mondo (unsigned long paddr,unsigned long type,unsigned long qmask) {unsigned long num_entries = (qmask +1 ) /64 ;unsigned long status;
@@ -897,7 +897,7 @@ static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type } } -void __cpuinit notrace sun4v_register_mondo_queues(int this_cpu) +void notrace sun4v_register_mondo_queues(int this_cpu) {struct trap_per_cpu *tb = &trap_block[this_cpu];
arch/sparc64/kernel/mdesc.c +1 -1
@@ -762,7 +762,7 @@ static void __devinit get_mondo_data(struct mdesc_handle *hp, u64 mp,get_one_mondo_bits (val, &tb->nonresum_qmask,2 ); } -void __cpuinit mdesc_fill_in_cpu_data (cpumask_t mask) +void mdesc_fill_in_cpu_data (cpumask_t mask) {struct mdesc_handle *hp =mdesc_grab ();u64 mp;
arch/sparc64/kernel/smp.c +2 -2
@@ -85,7 +85,7 @@ extern void setup_sparc64_timer(void);static volatile unsigned long callin_flag =0 ; -void __cpuinit smp_callin (void ) +void smp_callin (void ) {int cpuid =hard_smp_processor_id ();
@@ -1231,7 +1231,7 @@ void __devinit smp_fill_in_sib_core_maps(void) } } -int __cpuinit __cpu_up (unsigned int cpu) +int __cpu_up (unsigned int cpu) {int ret =smp_boot_one_cpu (cpu);
arch/sparc64/kernel/sysfs.c +2 -2
@@ -243,7 +243,7 @@ static void unregister_cpu_online(unsigned int cpu) }#endif -static int __cpuinit sysfs_cpu_notify (struct notifier_block *self, +static int sysfs_cpu_notify (struct notifier_block *self,unsigned long action,void *hcpu) {unsigned int cpu = (unsigned int )(long )hcpu;
@@ -263,7 +263,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,return NOTIFY_OK ; } -static struct notifier_block __cpuinitdata sysfs_cpu_nb = { +static struct notifier_block sysfs_cpu_nb = { .notifier_call = sysfs_cpu_notify, };
arch/sparc64/mm/init.c +1 -1
@@ -1645,7 +1645,7 @@ static void __init sun4v_ktsb_init(void)#endif } -void __cpuinit sun4v_ktsb_register (void ) +void sun4v_ktsb_register (void ) {unsigned long pa, ret;
arch/x86/kernel/acpi/boot.c +2 -2
@@ -243,7 +243,7 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)return 0 ; } -static void __cpuinit acpi_register_lapic (int id,u8 enabled) +static void acpi_register_lapic (int id,u8 enabled) {unsigned int ver =0 ;
@@ -532,7 +532,7 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)*/ #ifdef CONFIG_ACPI_HOTPLUG_CPU -static int __cpuinit _acpi_map_lsapic (acpi_handle handle,int *pcpu) +static int _acpi_map_lsapic (acpi_handle handle,int *pcpu) {struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL };union acpi_object *obj;
arch/x86/kernel/apic_32.c +6 -6
@@ -61,7 +61,7 @@ static int force_enable_local_apic;int disable_apic;/* Disable local APIC timer from the kernel commandline or via dmi quirk */ -static int disable_apic_timer__cpuinitdata ; +static int disable_apic_timer;/* Local APIC timer works in C2 */ int local_apic_timer_c2_ok;EXPORT_SYMBOL_GPL (local_apic_timer_c2_ok);
@@ -205,7 +205,7 @@ EXPORT_SYMBOL_GPL(apic_ops);/** * enable_NMI_through_LVT0 - enable NMI through local vector table 0 */ -void __cpuinit enable_NMI_through_LVT0 (void ) +void enable_NMI_through_LVT0 (void ) {unsigned int v;
@@ -989,7 +989,7 @@ void __init init_bsp_APIC(void)apic_write (APIC_LVT1 , value); } -static void __cpuinit lapic_setup_esr (void ) +static void lapic_setup_esr (void ) {unsigned long oldvalue, value, maxlvt;if (lapic_is_integrated () && !esr_disable) {
@@ -1031,7 +1031,7 @@ static void __cpuinit lapic_setup_esr(void)/** * setup_local_APIC - setup the local APIC */ -void __cpuinit setup_local_APIC (void ) +void setup_local_APIC (void ) {unsigned long value, integrated;int i, j;
@@ -1159,7 +1159,7 @@ void __cpuinit setup_local_APIC(void)apic_write (APIC_LVT1 , value); } -void __cpuinit end_local_APIC_setup (void ) +void end_local_APIC_setup (void ) {lapic_setup_esr ();
@@ -1487,7 +1487,7 @@ void disconnect_bsp_APIC(int virt_wire_setup)apic_write (APIC_LVT1 , value); } -void __cpuinit generic_processor_info (int apicid,int version) +void generic_processor_info (int apicid,int version) {int cpu;cpumask_t tmp_map;
arch/x86/kernel/apic_64.c +9 -9
@@ -46,7 +46,7 @@#include <mach_apic.h> /* Disable local APIC timer from the kernel commandline or via dmi quirk */ -static int disable_apic_timer__cpuinitdata ; +static int disable_apic_timer;static int apic_calibrate_pmtmr__initdata ;int disable_apic;int disable_x2apic;
@@ -225,7 +225,7 @@ static struct apic_ops x2apic_ops = {/** * enable_NMI_through_LVT0 - enable NMI through local vector table 0 */ -void __cpuinit enable_NMI_through_LVT0 (void ) +void enable_NMI_through_LVT0 (void ) {unsigned int v;
@@ -535,7 +535,7 @@ void __init setup_boot_APIC_clock(void)setup_APIC_timer (); } -void __cpuinit setup_secondary_APIC_clock (void ) +void setup_secondary_APIC_clock (void ) {setup_APIC_timer (); }
@@ -874,7 +874,7 @@ void __init init_bsp_APIC(void)apic_write (APIC_LVT1 , value); } -static void __cpuinit lapic_setup_esr (void ) +static void lapic_setup_esr (void ) {unsigned long oldvalue, value, maxlvt;if (lapic_is_integrated () && !esr_disable) {
@@ -916,7 +916,7 @@ static void __cpuinit lapic_setup_esr(void)/** * setup_local_APIC - setup the local APIC */ -void __cpuinit setup_local_APIC (void ) +void setup_local_APIC (void ) {unsigned int value;int i, j;
@@ -1018,7 +1018,7 @@ void __cpuinit setup_local_APIC(void)preempt_enable (); } -void __cpuinit end_local_APIC_setup (void ) +void end_local_APIC_setup (void ) {lapic_setup_esr ();
@@ -1425,7 +1425,7 @@ void disconnect_bsp_APIC(int virt_wire_setup)apic_write (APIC_LVT1 , value); } -void __cpuinit generic_processor_info (int apicid,int version) +void generic_processor_info (int apicid,int version) {int cpu;cpumask_t tmp_map;
@@ -1645,7 +1645,7 @@ static struct sys_device device_lapic = { .cls = &lapic_sysclass, }; -static void __cpuinit apic_pm_activate (void ) +static void apic_pm_activate (void ) { apic_pm_state.active =1 ; }
@@ -1680,7 +1680,7 @@ static void apic_pm_activate(void) { }* multi-chassis. Use available data to take a good guess. * If in doubt, go HPET. */ -__cpuinit int apic_is_clustered_box (void ) +int apic_is_clustered_box (void ) {int i, clusters, zeros;unsigned id;
arch/x86/kernel/cpu/addon_cpuid_features.c +3 -3
@@ -23,7 +23,7 @@ enum cpuid_regs { CR_EBX }; -void __cpuinit init_scattered_cpuid_features (struct cpuinfo_x86 *c) +void init_scattered_cpuid_features (struct cpuinfo_x86 *c) {u32 max_level;u32 regs[4 ];
@@ -67,7 +67,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)* exists, use it for populating initial_apicid and cpu topology * detection. */ -void __cpuinit detect_extended_topology (struct cpuinfo_x86 *c) +void detect_extended_topology (struct cpuinfo_x86 *c) {#ifdef CONFIG_SMP unsigned int eax, ebx, ecx, edx, sub_index;
@@ -137,7 +137,7 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) }#ifdef CONFIG_X86_PAT -void __cpuinit validate_pat_support (struct cpuinfo_x86 *c) +void validate_pat_support (struct cpuinfo_x86 *c) {if (!cpu_has_pat)pat_disable ("PAT not supported by CPU." );
arch/x86/kernel/cpu/amd.c +11 -11
@@ -33,7 +33,7 @@extern void vide (void ); __asm__(".align 4\nvide: ret" ); -static void __cpuinit init_amd_k5 (struct cpuinfo_x86 *c) +static void init_amd_k5 (struct cpuinfo_x86 *c) {/* * General Systems BIOSen alias the cpu frequency registers
@@ -51,7 +51,7 @@ static void __cpuinit init_amd_k5(struct cpuinfo_x86 *c) } -static void __cpuinit init_amd_k6 (struct cpuinfo_x86 *c) +static void init_amd_k6 (struct cpuinfo_x86 *c) {u32 l, h;int mbytes = num_physpages >> (20 -PAGE_SHIFT );
@@ -143,7 +143,7 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c) } } -static void __cpuinit init_amd_k7 (struct cpuinfo_x86 *c) +static void init_amd_k7 (struct cpuinfo_x86 *c) {u32 l, h;
@@ -181,7 +181,7 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)#endif #if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 ) -static int __cpuinit nearby_node (int apicid) +static int nearby_node (int apicid) {int i, node;
@@ -203,7 +203,7 @@ static int __cpuinit nearby_node(int apicid)* On a AMD dual core setup the lower bits of the APIC id distingush the cores. * Assumes number of cores is a power of two. */ -static void __cpuinit amd_detect_cmp (struct cpuinfo_x86 *c) +static void amd_detect_cmp (struct cpuinfo_x86 *c) {#ifdef CONFIG_X86_HT unsigned bits;
@@ -217,7 +217,7 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)#endif } -static void __cpuinit srat_detect_node (struct cpuinfo_x86 *c) +static void srat_detect_node (struct cpuinfo_x86 *c) {#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 )int cpu =smp_processor_id ();
@@ -253,7 +253,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)#endif } -static void __cpuinit early_init_amd_mc (struct cpuinfo_x86 *c) +static void early_init_amd_mc (struct cpuinfo_x86 *c) {#ifdef CONFIG_X86_HT unsigned bits, ecx;
@@ -279,7 +279,7 @@ static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c)#endif } -static void __cpuinit early_init_amd (struct cpuinfo_x86 *c) +static void early_init_amd (struct cpuinfo_x86 *c) {early_init_amd_mc (c);
@@ -298,7 +298,7 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)#endif } -static void __cpuinit init_amd (struct cpuinfo_x86 *c) +static void init_amd (struct cpuinfo_x86 *c) {#ifdef CONFIG_SMP unsigned long long value;
@@ -433,7 +433,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) }#ifdef CONFIG_X86_32 -static unsigned int __cpuinit amd_size_cache (struct cpuinfo_x86 *c,unsigned int size) +static unsigned int amd_size_cache (struct cpuinfo_x86 *c,unsigned int size) {/* AMD errata T13 (order #21922) */ if ((c->x86 ==6 )) {
@@ -447,7 +447,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int }#endif -static struct cpu_dev amd_cpu_dev__cpuinitdata = { +static struct cpu_dev amd_cpu_dev = { .c_vendor ="AMD" , .c_ident = {"AuthenticAMD" }, #ifdef CONFIG_X86_32
arch/x86/kernel/cpu/centaur.c +13 -13
@@ -11,7 +11,7 @@#ifdef CONFIG_X86_OOSTORE -static u32 __cpuinit power2 (u32 x) +static u32 power2 (u32 x) {u32 s =1 ;
@@ -25,7 +25,7 @@ static u32 __cpuinit power2(u32 x)/* * Set up an actual MCR */ -static void __cpuinit centaur_mcr_insert (int reg,u32 base,u32 size,int key) +static void centaur_mcr_insert (int reg,u32 base,u32 size,int key) {u32 lo, hi;
@@ -42,7 +42,7 @@ static void __cpuinit centaur_mcr_insert(int reg, u32 base, u32 size, int key)* * Shortcut: We know you can't put 4Gig of RAM on a winchip */ -static u32 __cpuinit ramtop (void ) +static u32 ramtop (void ) {u32 clip =0xFFFFFFFFUL ;u32 top =0 ;
@@ -91,7 +91,7 @@ static u32 __cpuinit ramtop(void)/* * Compute a set of MCR's to give maximum coverage */ -static int __cpuinit centaur_mcr_compute (int nr,int key) +static int centaur_mcr_compute (int nr,int key) {u32 mem =ramtop ();u32 root =power2 (mem);
@@ -157,7 +157,7 @@ static int __cpuinit centaur_mcr_compute(int nr, int key)return ct; } -static void __cpuinit centaur_create_optimal_mcr (void ) +static void centaur_create_optimal_mcr (void ) {int used;int i;
@@ -181,7 +181,7 @@ static void __cpuinit centaur_create_optimal_mcr(void)wrmsr (MSR_IDT_MCR0 +i,0 ,0 ); } -static void __cpuinit winchip2_create_optimal_mcr (void ) +static void winchip2_create_optimal_mcr (void ) {u32 lo, hi;int used;
@@ -217,7 +217,7 @@ static void __cpuinit winchip2_create_optimal_mcr(void)/* * Handle the MCR key on the Winchip 2. */ -static void __cpuinit winchip2_unprotect_mcr (void ) +static void winchip2_unprotect_mcr (void ) {u32 lo, hi;u32 key;
@@ -229,7 +229,7 @@ static void __cpuinit winchip2_unprotect_mcr(void)wrmsr (MSR_IDT_MCR_CTRL , lo, hi); } -static void __cpuinit winchip2_protect_mcr (void ) +static void winchip2_protect_mcr (void ) {u32 lo, hi;
@@ -247,7 +247,7 @@ static void __cpuinit winchip2_protect_mcr(void)#define RNG_ENABLED (1 << 3)#define RNG_ENABLE (1 << 6)/* MSR_VIA_RNG */ -static void __cpuinit init_c3 (struct cpuinfo_x86 *c) +static void init_c3 (struct cpuinfo_x86 *c) {u32 lo, hi;
@@ -313,7 +313,7 @@ enum { EAMD3D = 1<<20, }; -static void __cpuinit early_init_centaur (struct cpuinfo_x86 *c) +static void early_init_centaur (struct cpuinfo_x86 *c) {switch (c->x86) {case 5 :
@@ -323,7 +323,7 @@ static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c) } } -static void __cpuinit init_centaur (struct cpuinfo_x86 *c) +static void init_centaur (struct cpuinfo_x86 *c) {char *name;
@@ -449,7 +449,7 @@ static void __cpuinit init_centaur(struct cpuinfo_x86 *c) } } -static unsigned int __cpuinit +static unsigned int centaur_size_cache (struct cpuinfo_x86 *c,unsigned int size) {/* VIA C3 CPUs (670-68F) need further shifting. */
@@ -468,7 +468,7 @@ centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size)return size; } -static struct cpu_dev centaur_cpu_dev__cpuinitdata = { +static struct cpu_dev centaur_cpu_dev = { .c_vendor ="Centaur" , .c_ident = {"CentaurHauls" }, .c_early_init = early_init_centaur,
arch/x86/kernel/cpu/centaur_64.c +3 -3
@@ -6,7 +6,7 @@#include "cpu.h" -static void __cpuinit early_init_centaur (struct cpuinfo_x86 *c) +static void early_init_centaur (struct cpuinfo_x86 *c) {if (c->x86 ==0x6 && c->x86_model >=0xf )set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC );
@@ -14,7 +14,7 @@ static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_SYSENTER32 ); } -static void __cpuinit init_centaur (struct cpuinfo_x86 *c) +static void init_centaur (struct cpuinfo_x86 *c) {early_init_centaur (c);
@@ -25,7 +25,7 @@ static void __cpuinit init_centaur(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC ); } -static struct cpu_dev centaur_cpu_dev__cpuinitdata = { +static struct cpu_dev centaur_cpu_dev = { .c_vendor ="Centaur" , .c_ident = {"CentaurHauls" }, .c_early_init = early_init_centaur,
arch/x86/kernel/cpu/common.c +29 -29
221 lines not on this page · raw message
arch/x86/kernel/cpu/cpufreq/powernow-k8.c +2 -2
@@ -1098,7 +1098,7 @@ static int powernowk8_verify(struct cpufreq_policy *pol) }/* per CPU init entry point to the driver */ -static int __cpuinit powernowk8_cpu_init (struct cpufreq_policy *pol) +static int powernowk8_cpu_init (struct cpufreq_policy *pol) {struct powernow_k8_data *data;cpumask_t oldmask;
@@ -1290,7 +1290,7 @@ static struct cpufreq_driver cpufreq_amd64_driver = { };/* driver entry point for init */ -static int __cpuinit powernowk8_init (void ) +static int powernowk8_init (void ) {unsigned int i, supported_cpus =0 ;
arch/x86/kernel/cpu/cyrix.c +20 -20
@@ -15,7 +15,7 @@/* * Read NSC/Cyrix DEVID registers (DIR) to get more detailed info. about the CPU */ -static void __cpuinit __do_cyrix_devid (unsigned char *dir0,unsigned char *dir1) +static void __do_cyrix_devid (unsigned char *dir0,unsigned char *dir1) {
Lines of this file are not shown. View the raw message.
arch/x86/kernel/cpu/intel_cacheinfo.c +22 -22
44 lines not on this page · raw message
arch/x86/kernel/cpu/mcheck/mce_amd_64.c +5 -5
Lines of this file are not shown. View the raw message.
arch/x86/kernel/cpu/mcheck/mce_intel_64.c +2 -2
Lines of this file are not shown. View the raw message.
arch/x86/kernel/cpu/mcheck/therm_throt.c +4 -4
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 7 lines
1.5.5.1 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Part of the diff is not shown here. View the raw message.
Quoted 3 lines · Arjan van de Ven
as discussed briefly at the kernel summit;
__cpuinitand__cpuexitare causing a ton more complexity than they're worth (just see how many section warnings an average build has);
Nice idea ... but on ia64 I actually see *more* section mismatch warnings with this patch applied :-(
generic_defconfig goes up from 6 to 7tiger_defconfig rises from 3 to 6
-Tony
Quoted 11 lines · On Wed, 22 Oct 2008 17:12:14 -0700 "Tony Luck" <[email protected]> wrote:
Quoted 3 lines · Arjan van de Ven
as discussed briefly at the kernel summit;
__cpuinitand__cpuexitare causing a ton more complexity than they're worth (just see how many section warnings an average build has);Nice idea ... but on ia64 I actually see *more* section mismatch warnings with this patch applied :-(
generic_defconfiggoes up from 6 to 7tiger_defconfigrises from 3 to 6
interesting... I don't see how that can be unless the checks originally had a bug and did not complain about a reference to __init(data) memory from inside __cpuinit memory...
(in which case my point of this being too complex and fragile is proven ;-)
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 5 lines · Arjan van de Ven
interesting... I don't see how that can be unless the checks originally had a bug and did not complain about a reference to
__init(data)memory from inside__cpuinitmemory...
(in which case my point of this being too complex and fragile is proven ;-)
Definitely too complex and fragile. I rebuilt with CONFIG_DEBUG_SECTION_MISMATCH=y
and found that this patch just shuffled everything around. Only 4 mismatch warnings were the same with this patch, 11 old warnings went away, but 14 new ones appeared!
-Tony
Quoted 1 line · Arjan van de Ven
Subject: [PATCH] get rid if
__cpuinitand__cpuexit
Aiee!
Was something said about __devinit/__devexit ?
Quoted 6 lines · On Thu, 23 Oct 2008 10:21:43 +0400 Alexey Dobriyan <[email protected]> wrote:
Quoted 1 line · Arjan van de Ven
Subject: [PATCH] get rid if
__cpuinitand__cpuexitAiee!
Was something said about __devinit/__devexit ?
one at a time ;-)
but seriously, I do want to look at that one too. But it's the last one on the list, the meminit ones come next as "obscure and complex"
Signature · 3 lines
Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org
Quoted 6 lines · Arjan van de Ven
Quoted 3 lines · On Thu, 23 Oct 2008 10:21:43 +0400 Alexey Dobriyan <[email protected]> wrote:
Quoted 1 line · Arjan van de Ven
Subject: [PATCH] get rid if
__cpuinitand__cpuexit
Quoted 8 lines
Quoted 3 lines
Aiee!
Was something said about __devinit/__devexit ?
one at a time ;-)
but seriously, I do want to look at that one too. But it's the last one on the list, the meminit ones come next as "obscure and complex"
__meminit is actually contorlled by memory hotplug which is off on most people boxes, unlike __devinit which is controlled by CONFIG_HOTPLUG which is on.
Suggest reassign priorities. :^)