* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: linux-m32r-ja, x86, linux-sh, Viresh Kumar, linux, H. Peter Anvin,
Will Deacon, David Howells, Paul Gortmaker, James Hogan,
Paul Mackerras, Helge Deller, sparclinux, linux-ia64, netdev,
Sonic Zhang, Josh Triplett, Jonas Bonn, linux-s390,
Jesper Nilsson, Russell King, Max Filippov, linux-hexagon,
Hirokazu Takata, linux-pm, cpufreq, lm-sensors, linux-acpi,
Ingo Molnar, Lennox Wu, Catalin Marinas, Matt Turner,
Paul E. McKenney, Len Brown, Fenghua Yu, Bob Liu, Mike Frysinger,
Arnd Bergmann, Chris Zankel, Heiko Carstens, linux-xtensa,
Rusty Russell, Chris Metcalf, Mikael Starvik, linux-m32r,
Ivan Kokshaysky, uclinux-dist-devel, Thomas Gleixner,
linux-arm-kernel, Richard Henderson, Jens Axboe,
Rafael J. Wysocki, Tony Luck, linux-parisc, linux-cris-kernel,
Chen Liqin, Greg Kroah-Hartman, linux390, Richard Kuo, Paul Mundt,
Vineet Gupta, Martin Schwidefsky, John Stultz, linuxppc-dev,
David S. Miller
This is the whole patch queue for removal of __cpuinit support
against the latest linux-next tree (Jun24th). Some of you may
have already seen chunks of it, or already read the logistics
of what is being done (and why) here:
https://lkml.org/lkml/2013/6/20/513
I won't repeat all that here again, other than to say this send
is to ensure arch/subsystem maintainers get a 2nd chance to know
what is going on and to look at what is being proposed for their
area of code. That, and to ensure one complete continuous copy
of it gets mailed out. You can also see the patch queue here:
http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
If you've noticed that a chunk for MIPS isn't present here, that
is because it has already been queued in the linux-mips for-next
branch.
Thanks,
Paul.
---
Cc: Len Brown <lenb@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Josh Triplett <josh@freedesktop.org>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-acpi@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: uclinux-dist-devel@blackfin.uclinux.org
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Cc: linux-hexagon@vger.kernel.org
Cc: lm-sensors@lm-sensors.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-m32r@ml.linux-m32r.org
Cc: linux-m32r-ja@ml.linux-m32r.org
Cc: netdev@vger.kernel.org
Cc: linux@lists.openrisc.net
Cc: linux-parisc@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-xtensa@linux-xtensa.org
Paul Gortmaker (32):
init.h: remove __cpuinit sections from the kernel
modpost: remove all traces of cpuinit/cpuexit sections
alpha: delete __cpuinit usage from all users
powerpc: delete __cpuinit usage from all users
parisc: delete __cpuinit usage from all users
ia64: delete __cpuinit usage from all ia64 users
arm: delete __cpuinit/__CPUINIT usage from all ARM users
sparc: delete __cpuinit/__CPUINIT usage from all users
arm64: delete __cpuinit usage from all users
arc: delete __cpuinit usage from all arc files
blackfin: delete __cpuinit usage from all blackfin files
s390: delete __cpuinit usage from all s390 files
sh: delete __cpuinit usage from all sh files
tile: delete __cpuinit usage from all tile files
metag: delete __cpuinit usage from all metag files
cris: delete __cpuinit usage from all cris files
frv: delete __cpuinit usage from all frv files
hexagon: delete __cpuinit usage from all hexagon files
m32r: delete __cpuinit usage from all m32r files
openrisc: delete __cpuinit usage from all openrisc files
xtensa: delete __cpuinit usage from all xtensa files
score: delete __cpuinit usage from all score files
x86: delete __cpuinit usage from all x86 files
clocksource+irqchip: delete __cpuinit usage from all related files
cpufreq: delete __cpuinit usage from all cpufreq files
hwmon: delete __cpuinit usage from all hwmon files
acpi: delete __cpuinit usage from all acpi files
net: delete __cpuinit usage from all net files
rcu: delete __cpuinit usage from all rcu files
kernel: delete __cpuinit usage from all core kernel files
drivers: delete __cpuinit usage from all remaining drivers files
block: delete __cpuinit usage from all block files
Documentation/cpu-hotplug.txt | 6 +--
arch/alpha/kernel/smp.c | 10 ++---
arch/alpha/kernel/traps.c | 4 +-
arch/arc/include/asm/irq.h | 2 +-
arch/arc/kernel/irq.c | 2 +-
arch/arc/kernel/setup.c | 10 ++---
arch/arc/kernel/smp.c | 4 +-
arch/arc/kernel/time.c | 6 +--
arch/arc/mm/cache_arc700.c | 4 +-
arch/arc/mm/tlb.c | 4 +-
arch/arm/common/mcpm_platsmp.c | 4 +-
arch/arm/include/asm/arch_timer.h | 2 +-
arch/arm/kernel/head-common.S | 1 -
arch/arm/kernel/head.S | 1 -
arch/arm/kernel/hw_breakpoint.c | 4 +-
arch/arm/kernel/perf_event_cpu.c | 6 +--
arch/arm/kernel/psci_smp.c | 3 +-
arch/arm/kernel/smp.c | 18 ++++----
arch/arm/kernel/smp_twd.c | 6 +--
arch/arm/lib/delay.c | 2 +-
arch/arm/mach-exynos/headsmp.S | 2 -
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-highbank/platsmp.c | 2 +-
arch/arm/mach-imx/platsmp.c | 2 +-
arch/arm/mach-msm/headsmp.S | 2 -
arch/arm/mach-msm/platsmp.c | 6 +--
arch/arm/mach-msm/timer.c | 4 +-
arch/arm/mach-mvebu/coherency.c | 2 +-
arch/arm/mach-mvebu/headsmp.S | 2 -
arch/arm/mach-mvebu/platsmp.c | 5 +--
arch/arm/mach-omap2/omap-headsmp.S | 2 -
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 4 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
arch/arm/mach-prima2/headsmp.S | 2 -
arch/arm/mach-prima2/platsmp.c | 4 +-
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 2 -
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-socfpga/platsmp.c | 2 +-
arch/arm/mach-spear/generic.h | 2 +-
arch/arm/mach-spear/platsmp.c | 4 +-
arch/arm/mach-tegra/platsmp.c | 4 +-
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 4 +-
arch/arm/mach-zynq/common.h | 2 +-
arch/arm/mach-zynq/headsmp.S | 2 -
arch/arm/mach-zynq/platsmp.c | 6 +--
arch/arm/mm/proc-arm1020.S | 2 -
arch/arm/mm/proc-arm1020e.S | 2 -
arch/arm/mm/proc-arm1022.S | 2 -
arch/arm/mm/proc-arm1026.S | 3 --
arch/arm/mm/proc-arm720.S | 2 -
arch/arm/mm/proc-arm740.S | 2 -
arch/arm/mm/proc-arm7tdmi.S | 2 -
arch/arm/mm/proc-arm920.S | 2 -
arch/arm/mm/proc-arm922.S | 2 -
arch/arm/mm/proc-arm925.S | 2 -
arch/arm/mm/proc-arm926.S | 2 -
arch/arm/mm/proc-arm940.S | 2 -
arch/arm/mm/proc-arm946.S | 2 -
arch/arm/mm/proc-arm9tdmi.S | 2 -
arch/arm/mm/proc-fa526.S | 2 -
arch/arm/mm/proc-feroceon.S | 2 -
arch/arm/mm/proc-mohawk.S | 2 -
arch/arm/mm/proc-sa110.S | 2 -
arch/arm/mm/proc-sa1100.S | 2 -
arch/arm/mm/proc-v6.S | 2 -
arch/arm/mm/proc-v7-2level.S | 4 --
arch/arm/mm/proc-v7-3level.S | 4 --
arch/arm/mm/proc-v7.S | 2 -
arch/arm/mm/proc-xsc3.S | 2 -
arch/arm/mm/proc-xscale.S | 2 -
arch/arm/plat-versatile/platsmp.c | 6 +--
arch/arm64/include/asm/arch_timer.h | 2 +-
arch/arm64/kernel/debug-monitors.c | 6 +--
arch/arm64/kernel/hw_breakpoint.c | 4 +-
arch/arm64/kernel/smp.c | 8 ++--
arch/blackfin/kernel/perf_event.c | 2 +-
arch/blackfin/kernel/setup.c | 4 +-
arch/blackfin/mach-bf561/smp.c | 6 +--
arch/blackfin/mach-common/cache-c.c | 4 +-
arch/blackfin/mach-common/ints-priority.c | 2 +-
arch/blackfin/mach-common/smp.c | 8 ++--
arch/cris/arch-v32/kernel/smp.c | 2 +-
arch/frv/kernel/setup.c | 2 +-
arch/hexagon/kernel/setup.c | 2 +-
arch/hexagon/kernel/smp.c | 4 +-
arch/ia64/kernel/acpi.c | 4 +-
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 | 8 ++--
arch/ia64/kernel/topology.c | 18 ++++----
arch/ia64/mm/contig.c | 3 +-
arch/ia64/mm/discontig.c | 2 +-
arch/ia64/mm/numa.c | 2 +-
arch/ia64/sn/kernel/setup.c | 8 ++--
arch/ia64/xen/hypervisor.c | 2 +-
arch/m32r/kernel/smpboot.c | 2 +-
arch/metag/kernel/perf/perf_event.c | 6 +--
arch/metag/kernel/smp.c | 16 +++----
arch/metag/kernel/traps.c | 2 +-
arch/openrisc/kernel/setup.c | 2 +-
arch/parisc/kernel/firmware.c | 14 +++---
arch/parisc/kernel/hardware.c | 2 +-
arch/parisc/kernel/processor.c | 6 +--
arch/parisc/kernel/smp.c | 8 ++--
arch/powerpc/include/asm/rtas.h | 4 +-
arch/powerpc/include/asm/vdso.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
arch/powerpc/kernel/rtas.c | 4 +-
arch/powerpc/kernel/smp.c | 4 +-
arch/powerpc/kernel/sysfs.c | 6 +--
arch/powerpc/kernel/time.c | 1 -
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 6 +--
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/mmu_context_nohash.c | 6 +--
arch/powerpc/mm/numa.c | 7 ++-
arch/powerpc/mm/tlb_nohash.c | 2 +-
arch/powerpc/perf/core-book3s.c | 4 +-
arch/powerpc/platforms/44x/currituck.c | 4 +-
arch/powerpc/platforms/44x/iss4xx.c | 4 +-
arch/powerpc/platforms/85xx/smp.c | 6 +--
arch/powerpc/platforms/powermac/smp.c | 2 +-
arch/powerpc/platforms/powernv/smp.c | 2 +-
arch/s390/kernel/cache.c | 15 +++----
arch/s390/kernel/perf_cpum_cf.c | 4 +-
arch/s390/kernel/processor.c | 2 +-
arch/s390/kernel/smp.c | 17 ++++---
arch/s390/kernel/sysinfo.c | 2 +-
arch/s390/kernel/vtime.c | 6 +--
arch/s390/mm/fault.c | 4 +-
arch/score/mm/tlb-score.c | 2 +-
arch/sh/kernel/cpu/init.c | 18 ++++----
arch/sh/kernel/cpu/sh2/probe.c | 2 +-
arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
arch/sh/kernel/cpu/sh3/probe.c | 2 +-
arch/sh/kernel/cpu/sh4/probe.c | 2 +-
arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
arch/sh/kernel/cpu/sh5/probe.c | 2 +-
arch/sh/kernel/perf_event.c | 4 +-
arch/sh/kernel/process.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh/kernel/smp.c | 8 ++--
arch/sh/kernel/traps_32.c | 2 +-
arch/sh/kernel/traps_64.c | 2 +-
arch/sh/mm/tlb-sh5.c | 2 +-
arch/sparc/kernel/ds.c | 11 ++---
arch/sparc/kernel/entry.h | 2 +-
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/irq_64.c | 5 ++-
arch/sparc/kernel/leon_smp.c | 10 ++---
arch/sparc/kernel/mdesc.c | 34 +++++++-------
arch/sparc/kernel/smp_32.c | 20 ++++-----
arch/sparc/kernel/smp_64.c | 9 ++--
arch/sparc/kernel/sun4d_smp.c | 6 +--
arch/sparc/kernel/sun4m_smp.c | 6 +--
arch/sparc/kernel/sysfs.c | 4 +-
arch/sparc/kernel/trampoline_32.S | 3 --
arch/sparc/kernel/trampoline_64.S | 2 -
arch/sparc/mm/init_64.c | 2 +-
arch/sparc/mm/srmmu.c | 12 ++---
arch/tile/kernel/irq.c | 2 +-
arch/tile/kernel/messaging.c | 2 +-
arch/tile/kernel/setup.c | 12 ++---
arch/tile/kernel/smpboot.c | 8 ++--
arch/tile/kernel/time.c | 2 +-
arch/x86/include/asm/cpu.h | 2 +-
arch/x86/include/asm/microcode.h | 4 +-
arch/x86/include/asm/microcode_intel.h | 4 +-
arch/x86/include/asm/mmconfig.h | 4 +-
arch/x86/include/asm/mpspec.h | 2 +-
arch/x86/include/asm/numa.h | 6 +--
arch/x86/include/asm/prom.h | 2 +-
arch/x86/include/asm/smp.h | 2 +-
arch/x86/kernel/acpi/boot.c | 6 +--
arch/x86/kernel/apic/apic.c | 30 ++++++-------
arch/x86/kernel/apic/apic_numachip.c | 2 +-
arch/x86/kernel/apic/es7000_32.c | 2 +-
arch/x86/kernel/apic/numaq_32.c | 2 +-
arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
arch/x86/kernel/cpu/amd.c | 33 +++++++-------
arch/x86/kernel/cpu/centaur.c | 26 +++++------
arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
arch/x86/kernel/cpu/hypervisor.c | 2 +-
arch/x86/kernel/cpu/intel.c | 30 ++++++-------
arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
arch/x86/kernel/cpu/perf_event.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
arch/x86/kernel/cpu/rdrand.c | 2 +-
arch/x86/kernel/cpu/scattered.c | 4 +-
arch/x86/kernel/cpu/topology.c | 2 +-
arch/x86/kernel/cpu/transmeta.c | 6 +--
arch/x86/kernel/cpu/umc.c | 2 +-
arch/x86/kernel/cpu/vmware.c | 2 +-
arch/x86/kernel/cpuid.c | 7 ++-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/head_32.S | 1 -
arch/x86/kernel/i387.c | 8 ++--
arch/x86/kernel/irq_32.c | 2 +-
arch/x86/kernel/kvm.c | 10 ++---
arch/x86/kernel/kvmclock.c | 2 +-
arch/x86/kernel/microcode_core.c | 2 +-
arch/x86/kernel/microcode_core_early.c | 6 +--
arch/x86/kernel/microcode_intel_early.c | 26 +++++------
arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
arch/x86/kernel/msr.c | 6 +--
arch/x86/kernel/process.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/smpboot.c | 28 ++++++------
arch/x86/kernel/tboot.c | 6 +--
arch/x86/kernel/tsc.c | 4 +-
arch/x86/kernel/tsc_sync.c | 18 ++++----
arch/x86/kernel/vsyscall_64.c | 6 +--
arch/x86/kernel/x86_init.c | 4 +-
arch/x86/kernel/xsave.c | 4 +-
arch/x86/mm/mmio-mod.c | 4 +-
arch/x86/mm/numa.c | 12 ++---
arch/x86/mm/numa_emulation.c | 12 ++---
arch/x86/mm/setup_nx.c | 4 +-
arch/x86/pci/amd_bus.c | 8 ++--
arch/x86/platform/ce4100/ce4100.c | 2 +-
arch/x86/platform/mrst/mrst.c | 4 +-
arch/x86/xen/enlighten.c | 6 +--
arch/x86/xen/setup.c | 6 +--
arch/x86/xen/smp.c | 12 ++---
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/xen-ops.h | 2 +-
arch/xtensa/kernel/time.c | 2 +-
block/blk-iopoll.c | 6 +--
block/blk-softirq.c | 6 +--
drivers/acpi/acpi_processor.c | 2 +-
drivers/acpi/processor_core.c | 8 ++--
drivers/acpi/processor_driver.c | 8 ++--
drivers/acpi/processor_idle.c | 6 +--
drivers/base/cpu.c | 2 +-
drivers/base/topology.c | 10 ++---
drivers/clocksource/arm_arch_timer.c | 8 ++--
drivers/clocksource/exynos_mct.c | 4 +-
drivers/clocksource/metag_generic.c | 6 +--
drivers/clocksource/time-armada-370-xp.c | 4 +-
drivers/clocksource/timer-marco.c | 4 +-
drivers/cpufreq/cpufreq.c | 4 +-
drivers/cpufreq/cpufreq_stats.c | 4 +-
drivers/cpufreq/dbx500-cpufreq.c | 2 +-
drivers/cpufreq/intel_pstate.c | 4 +-
drivers/cpufreq/longhaul.c | 6 +--
drivers/cpufreq/longhaul.h | 26 +++++------
drivers/cpufreq/longrun.c | 8 ++--
drivers/cpufreq/omap-cpufreq.c | 2 +-
drivers/cpufreq/powernow-k7.c | 8 ++--
drivers/cpufreq/powernow-k8.c | 6 +--
drivers/hwmon/coretemp.c | 39 ++++++++--------
drivers/hwmon/via-cputemp.c | 8 ++--
drivers/irqchip/irq-gic.c | 8 ++--
drivers/oprofile/timer_int.c | 4 +-
drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
include/asm-generic/vmlinux.lds.h | 12 -----
include/linux/cpu.h | 2 +-
include/linux/init.h | 19 ++++----
include/linux/perf_event.h | 2 +-
init/calibrate.c | 13 +++---
kernel/cpu.c | 6 +--
kernel/events/core.c | 4 +-
kernel/fork.c | 2 +-
kernel/hrtimer.c | 6 +--
kernel/printk.c | 2 +-
kernel/profile.c | 2 +-
kernel/rcutorture.c | 6 +--
kernel/rcutree.c | 6 +--
kernel/rcutree.h | 4 +-
kernel/rcutree_plugin.h | 6 +--
kernel/relay.c | 2 +-
kernel/sched/core.c | 12 ++---
kernel/sched/fair.c | 2 +-
kernel/smp.c | 2 +-
kernel/smpboot.c | 2 +-
kernel/softirq.c | 8 ++--
kernel/time/tick-sched.c | 2 +-
kernel/timer.c | 10 ++---
kernel/workqueue.c | 4 +-
lib/Kconfig.debug | 2 +-
lib/earlycpio.c | 2 +-
lib/percpu_counter.c | 2 +-
mm/memcontrol.c | 2 +-
mm/page-writeback.c | 4 +-
mm/slab.c | 10 ++---
mm/slub.c | 4 +-
mm/vmstat.c | 6 +--
net/core/flow.c | 4 +-
net/iucv/iucv.c | 2 +-
scripts/mod/modpost.c | 52 ++++------------------
307 files changed, 896 insertions(+), 1037 deletions(-)
--
1.8.1.2
^ permalink raw reply [flat|nested] 88+ messages in thread
* [lm-sensors] [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
Benjamin Herrenschmidt, linux-sh-u79uwXL29TY76Z2rM5mHXA,
Viresh Kumar, linux-73nT9ZVIoz3k1uMJSBkQmQ, Matt Porter,
Will Deacon, x86-DgEjT+Ai2ygdnm+yROfE0A, David Howells,
Paul Gortmaker, James Hogan, Mackerras, Helge Deller,
sparclinux-u79uwXL29TY76Z2rM5mHXA,
linux-ia64-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
H. Peter Anvin, Josh Triplett, Jonas Bonn,
linux-s390-u79uwXL29TY76Z2rM5mHXA, Jesper Nilsson, Russell King
This is the whole patch queue for removal of __cpuinit support
against the latest linux-next tree (Jun24th). Some of you may
have already seen chunks of it, or already read the logistics
of what is being done (and why) here:
https://lkml.org/lkml/2013/6/20/513
I won't repeat all that here again, other than to say this send
is to ensure arch/subsystem maintainers get a 2nd chance to know
what is going on and to look at what is being proposed for their
area of code. That, and to ensure one complete continuous copy
of it gets mailed out. You can also see the patch queue here:
http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
If you've noticed that a chunk for MIPS isn't present here, that
is because it has already been queued in the linux-mips for-next
branch.
Thanks,
Paul.
---
Cc: Len Brown <lenb@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Josh Triplett <josh@freedesktop.org>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-acpi@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: uclinux-dist-devel@blackfin.uclinux.org
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-cris-kernel@axis.com
Cc: linux-hexagon@vger.kernel.org
Cc: lm-sensors@lm-sensors.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-m32r@ml.linux-m32r.org
Cc: linux-m32r-ja@ml.linux-m32r.org
Cc: netdev@vger.kernel.org
Cc: linux@lists.openrisc.net
Cc: linux-parisc@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-xtensa@linux-xtensa.org
Paul Gortmaker (32):
init.h: remove __cpuinit sections from the kernel
modpost: remove all traces of cpuinit/cpuexit sections
alpha: delete __cpuinit usage from all users
powerpc: delete __cpuinit usage from all users
parisc: delete __cpuinit usage from all users
ia64: delete __cpuinit usage from all ia64 users
arm: delete __cpuinit/__CPUINIT usage from all ARM users
sparc: delete __cpuinit/__CPUINIT usage from all users
arm64: delete __cpuinit usage from all users
arc: delete __cpuinit usage from all arc files
blackfin: delete __cpuinit usage from all blackfin files
s390: delete __cpuinit usage from all s390 files
sh: delete __cpuinit usage from all sh files
tile: delete __cpuinit usage from all tile files
metag: delete __cpuinit usage from all metag files
cris: delete __cpuinit usage from all cris files
frv: delete __cpuinit usage from all frv files
hexagon: delete __cpuinit usage from all hexagon files
m32r: delete __cpuinit usage from all m32r files
openrisc: delete __cpuinit usage from all openrisc files
xtensa: delete __cpuinit usage from all xtensa files
score: delete __cpuinit usage from all score files
x86: delete __cpuinit usage from all x86 files
clocksource+irqchip: delete __cpuinit usage from all related files
cpufreq: delete __cpuinit usage from all cpufreq files
hwmon: delete __cpuinit usage from all hwmon files
acpi: delete __cpuinit usage from all acpi files
net: delete __cpuinit usage from all net files
rcu: delete __cpuinit usage from all rcu files
kernel: delete __cpuinit usage from all core kernel files
drivers: delete __cpuinit usage from all remaining drivers files
block: delete __cpuinit usage from all block files
Documentation/cpu-hotplug.txt | 6 +--
arch/alpha/kernel/smp.c | 10 ++---
arch/alpha/kernel/traps.c | 4 +-
arch/arc/include/asm/irq.h | 2 +-
arch/arc/kernel/irq.c | 2 +-
arch/arc/kernel/setup.c | 10 ++---
arch/arc/kernel/smp.c | 4 +-
arch/arc/kernel/time.c | 6 +--
arch/arc/mm/cache_arc700.c | 4 +-
arch/arc/mm/tlb.c | 4 +-
arch/arm/common/mcpm_platsmp.c | 4 +-
arch/arm/include/asm/arch_timer.h | 2 +-
arch/arm/kernel/head-common.S | 1 -
arch/arm/kernel/head.S | 1 -
arch/arm/kernel/hw_breakpoint.c | 4 +-
arch/arm/kernel/perf_event_cpu.c | 6 +--
arch/arm/kernel/psci_smp.c | 3 +-
arch/arm/kernel/smp.c | 18 ++++----
arch/arm/kernel/smp_twd.c | 6 +--
arch/arm/lib/delay.c | 2 +-
arch/arm/mach-exynos/headsmp.S | 2 -
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-highbank/platsmp.c | 2 +-
arch/arm/mach-imx/platsmp.c | 2 +-
arch/arm/mach-msm/headsmp.S | 2 -
arch/arm/mach-msm/platsmp.c | 6 +--
arch/arm/mach-msm/timer.c | 4 +-
arch/arm/mach-mvebu/coherency.c | 2 +-
arch/arm/mach-mvebu/headsmp.S | 2 -
arch/arm/mach-mvebu/platsmp.c | 5 +--
arch/arm/mach-omap2/omap-headsmp.S | 2 -
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 4 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
arch/arm/mach-prima2/headsmp.S | 2 -
arch/arm/mach-prima2/platsmp.c | 4 +-
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 2 -
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-socfpga/platsmp.c | 2 +-
arch/arm/mach-spear/generic.h | 2 +-
arch/arm/mach-spear/platsmp.c | 4 +-
arch/arm/mach-tegra/platsmp.c | 4 +-
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 4 +-
arch/arm/mach-zynq/common.h | 2 +-
arch/arm/mach-zynq/headsmp.S | 2 -
arch/arm/mach-zynq/platsmp.c | 6 +--
arch/arm/mm/proc-arm1020.S | 2 -
arch/arm/mm/proc-arm1020e.S | 2 -
arch/arm/mm/proc-arm1022.S | 2 -
arch/arm/mm/proc-arm1026.S | 3 --
arch/arm/mm/proc-arm720.S | 2 -
arch/arm/mm/proc-arm740.S | 2 -
arch/arm/mm/proc-arm7tdmi.S | 2 -
arch/arm/mm/proc-arm920.S | 2 -
arch/arm/mm/proc-arm922.S | 2 -
arch/arm/mm/proc-arm925.S | 2 -
arch/arm/mm/proc-arm926.S | 2 -
arch/arm/mm/proc-arm940.S | 2 -
arch/arm/mm/proc-arm946.S | 2 -
arch/arm/mm/proc-arm9tdmi.S | 2 -
arch/arm/mm/proc-fa526.S | 2 -
arch/arm/mm/proc-feroceon.S | 2 -
arch/arm/mm/proc-mohawk.S | 2 -
arch/arm/mm/proc-sa110.S | 2 -
arch/arm/mm/proc-sa1100.S | 2 -
arch/arm/mm/proc-v6.S | 2 -
arch/arm/mm/proc-v7-2level.S | 4 --
arch/arm/mm/proc-v7-3level.S | 4 --
arch/arm/mm/proc-v7.S | 2 -
arch/arm/mm/proc-xsc3.S | 2 -
arch/arm/mm/proc-xscale.S | 2 -
arch/arm/plat-versatile/platsmp.c | 6 +--
arch/arm64/include/asm/arch_timer.h | 2 +-
arch/arm64/kernel/debug-monitors.c | 6 +--
arch/arm64/kernel/hw_breakpoint.c | 4 +-
arch/arm64/kernel/smp.c | 8 ++--
arch/blackfin/kernel/perf_event.c | 2 +-
arch/blackfin/kernel/setup.c | 4 +-
arch/blackfin/mach-bf561/smp.c | 6 +--
arch/blackfin/mach-common/cache-c.c | 4 +-
arch/blackfin/mach-common/ints-priority.c | 2 +-
arch/blackfin/mach-common/smp.c | 8 ++--
arch/cris/arch-v32/kernel/smp.c | 2 +-
arch/frv/kernel/setup.c | 2 +-
arch/hexagon/kernel/setup.c | 2 +-
arch/hexagon/kernel/smp.c | 4 +-
arch/ia64/kernel/acpi.c | 4 +-
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 | 8 ++--
arch/ia64/kernel/topology.c | 18 ++++----
arch/ia64/mm/contig.c | 3 +-
arch/ia64/mm/discontig.c | 2 +-
arch/ia64/mm/numa.c | 2 +-
arch/ia64/sn/kernel/setup.c | 8 ++--
arch/ia64/xen/hypervisor.c | 2 +-
arch/m32r/kernel/smpboot.c | 2 +-
arch/metag/kernel/perf/perf_event.c | 6 +--
arch/metag/kernel/smp.c | 16 +++----
arch/metag/kernel/traps.c | 2 +-
arch/openrisc/kernel/setup.c | 2 +-
arch/parisc/kernel/firmware.c | 14 +++---
arch/parisc/kernel/hardware.c | 2 +-
arch/parisc/kernel/processor.c | 6 +--
arch/parisc/kernel/smp.c | 8 ++--
arch/powerpc/include/asm/rtas.h | 4 +-
arch/powerpc/include/asm/vdso.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
arch/powerpc/kernel/rtas.c | 4 +-
arch/powerpc/kernel/smp.c | 4 +-
arch/powerpc/kernel/sysfs.c | 6 +--
arch/powerpc/kernel/time.c | 1 -
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 6 +--
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/mmu_context_nohash.c | 6 +--
arch/powerpc/mm/numa.c | 7 ++-
arch/powerpc/mm/tlb_nohash.c | 2 +-
arch/powerpc/perf/core-book3s.c | 4 +-
arch/powerpc/platforms/44x/currituck.c | 4 +-
arch/powerpc/platforms/44x/iss4xx.c | 4 +-
arch/powerpc/platforms/85xx/smp.c | 6 +--
arch/powerpc/platforms/powermac/smp.c | 2 +-
arch/powerpc/platforms/powernv/smp.c | 2 +-
arch/s390/kernel/cache.c | 15 +++----
arch/s390/kernel/perf_cpum_cf.c | 4 +-
arch/s390/kernel/processor.c | 2 +-
arch/s390/kernel/smp.c | 17 ++++---
arch/s390/kernel/sysinfo.c | 2 +-
arch/s390/kernel/vtime.c | 6 +--
arch/s390/mm/fault.c | 4 +-
arch/score/mm/tlb-score.c | 2 +-
arch/sh/kernel/cpu/init.c | 18 ++++----
arch/sh/kernel/cpu/sh2/probe.c | 2 +-
arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
arch/sh/kernel/cpu/sh3/probe.c | 2 +-
arch/sh/kernel/cpu/sh4/probe.c | 2 +-
arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
arch/sh/kernel/cpu/sh5/probe.c | 2 +-
arch/sh/kernel/perf_event.c | 4 +-
arch/sh/kernel/process.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh/kernel/smp.c | 8 ++--
arch/sh/kernel/traps_32.c | 2 +-
arch/sh/kernel/traps_64.c | 2 +-
arch/sh/mm/tlb-sh5.c | 2 +-
arch/sparc/kernel/ds.c | 11 ++---
arch/sparc/kernel/entry.h | 2 +-
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/irq_64.c | 5 ++-
arch/sparc/kernel/leon_smp.c | 10 ++---
arch/sparc/kernel/mdesc.c | 34 +++++++-------
arch/sparc/kernel/smp_32.c | 20 ++++-----
arch/sparc/kernel/smp_64.c | 9 ++--
arch/sparc/kernel/sun4d_smp.c | 6 +--
arch/sparc/kernel/sun4m_smp.c | 6 +--
arch/sparc/kernel/sysfs.c | 4 +-
arch/sparc/kernel/trampoline_32.S | 3 --
arch/sparc/kernel/trampoline_64.S | 2 -
arch/sparc/mm/init_64.c | 2 +-
arch/sparc/mm/srmmu.c | 12 ++---
arch/tile/kernel/irq.c | 2 +-
arch/tile/kernel/messaging.c | 2 +-
arch/tile/kernel/setup.c | 12 ++---
arch/tile/kernel/smpboot.c | 8 ++--
arch/tile/kernel/time.c | 2 +-
arch/x86/include/asm/cpu.h | 2 +-
arch/x86/include/asm/microcode.h | 4 +-
arch/x86/include/asm/microcode_intel.h | 4 +-
arch/x86/include/asm/mmconfig.h | 4 +-
arch/x86/include/asm/mpspec.h | 2 +-
arch/x86/include/asm/numa.h | 6 +--
arch/x86/include/asm/prom.h | 2 +-
arch/x86/include/asm/smp.h | 2 +-
arch/x86/kernel/acpi/boot.c | 6 +--
arch/x86/kernel/apic/apic.c | 30 ++++++-------
arch/x86/kernel/apic/apic_numachip.c | 2 +-
arch/x86/kernel/apic/es7000_32.c | 2 +-
arch/x86/kernel/apic/numaq_32.c | 2 +-
arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
arch/x86/kernel/cpu/amd.c | 33 +++++++-------
arch/x86/kernel/cpu/centaur.c | 26 +++++------
arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
arch/x86/kernel/cpu/hypervisor.c | 2 +-
arch/x86/kernel/cpu/intel.c | 30 ++++++-------
arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
arch/x86/kernel/cpu/perf_event.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
arch/x86/kernel/cpu/rdrand.c | 2 +-
arch/x86/kernel/cpu/scattered.c | 4 +-
arch/x86/kernel/cpu/topology.c | 2 +-
arch/x86/kernel/cpu/transmeta.c | 6 +--
arch/x86/kernel/cpu/umc.c | 2 +-
arch/x86/kernel/cpu/vmware.c | 2 +-
arch/x86/kernel/cpuid.c | 7 ++-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/head_32.S | 1 -
arch/x86/kernel/i387.c | 8 ++--
arch/x86/kernel/irq_32.c | 2 +-
arch/x86/kernel/kvm.c | 10 ++---
arch/x86/kernel/kvmclock.c | 2 +-
arch/x86/kernel/microcode_core.c | 2 +-
arch/x86/kernel/microcode_core_early.c | 6 +--
arch/x86/kernel/microcode_intel_early.c | 26 +++++------
arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
arch/x86/kernel/msr.c | 6 +--
arch/x86/kernel/process.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/smpboot.c | 28 ++++++------
arch/x86/kernel/tboot.c | 6 +--
arch/x86/kernel/tsc.c | 4 +-
arch/x86/kernel/tsc_sync.c | 18 ++++----
arch/x86/kernel/vsyscall_64.c | 6 +--
arch/x86/kernel/x86_init.c | 4 +-
arch/x86/kernel/xsave.c | 4 +-
arch/x86/mm/mmio-mod.c | 4 +-
arch/x86/mm/numa.c | 12 ++---
arch/x86/mm/numa_emulation.c | 12 ++---
arch/x86/mm/setup_nx.c | 4 +-
arch/x86/pci/amd_bus.c | 8 ++--
arch/x86/platform/ce4100/ce4100.c | 2 +-
arch/x86/platform/mrst/mrst.c | 4 +-
arch/x86/xen/enlighten.c | 6 +--
arch/x86/xen/setup.c | 6 +--
arch/x86/xen/smp.c | 12 ++---
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/xen-ops.h | 2 +-
arch/xtensa/kernel/time.c | 2 +-
block/blk-iopoll.c | 6 +--
block/blk-softirq.c | 6 +--
drivers/acpi/acpi_processor.c | 2 +-
drivers/acpi/processor_core.c | 8 ++--
drivers/acpi/processor_driver.c | 8 ++--
drivers/acpi/processor_idle.c | 6 +--
drivers/base/cpu.c | 2 +-
drivers/base/topology.c | 10 ++---
drivers/clocksource/arm_arch_timer.c | 8 ++--
drivers/clocksource/exynos_mct.c | 4 +-
drivers/clocksource/metag_generic.c | 6 +--
drivers/clocksource/time-armada-370-xp.c | 4 +-
drivers/clocksource/timer-marco.c | 4 +-
drivers/cpufreq/cpufreq.c | 4 +-
drivers/cpufreq/cpufreq_stats.c | 4 +-
drivers/cpufreq/dbx500-cpufreq.c | 2 +-
drivers/cpufreq/intel_pstate.c | 4 +-
drivers/cpufreq/longhaul.c | 6 +--
drivers/cpufreq/longhaul.h | 26 +++++------
drivers/cpufreq/longrun.c | 8 ++--
drivers/cpufreq/omap-cpufreq.c | 2 +-
drivers/cpufreq/powernow-k7.c | 8 ++--
drivers/cpufreq/powernow-k8.c | 6 +--
drivers/hwmon/coretemp.c | 39 ++++++++--------
drivers/hwmon/via-cputemp.c | 8 ++--
drivers/irqchip/irq-gic.c | 8 ++--
drivers/oprofile/timer_int.c | 4 +-
drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
include/asm-generic/vmlinux.lds.h | 12 -----
include/linux/cpu.h | 2 +-
include/linux/init.h | 19 ++++----
include/linux/perf_event.h | 2 +-
init/calibrate.c | 13 +++---
kernel/cpu.c | 6 +--
kernel/events/core.c | 4 +-
kernel/fork.c | 2 +-
kernel/hrtimer.c | 6 +--
kernel/printk.c | 2 +-
kernel/profile.c | 2 +-
kernel/rcutorture.c | 6 +--
kernel/rcutree.c | 6 +--
kernel/rcutree.h | 4 +-
kernel/rcutree_plugin.h | 6 +--
kernel/relay.c | 2 +-
kernel/sched/core.c | 12 ++---
kernel/sched/fair.c | 2 +-
kernel/smp.c | 2 +-
kernel/smpboot.c | 2 +-
kernel/softirq.c | 8 ++--
kernel/time/tick-sched.c | 2 +-
kernel/timer.c | 10 ++---
kernel/workqueue.c | 4 +-
lib/Kconfig.debug | 2 +-
lib/earlycpio.c | 2 +-
lib/percpu_counter.c | 2 +-
mm/memcontrol.c | 2 +-
mm/page-writeback.c | 4 +-
mm/slab.c | 10 ++---
mm/slub.c | 4 +-
mm/vmstat.c | 6 +--
net/core/flow.c | 4 +-
net/iucv/iucv.c | 2 +-
scripts/mod/modpost.c | 52 ++++------------------
307 files changed, 896 insertions(+), 1037 deletions(-)
--
1.8.1.2
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
Benjamin Herrenschmidt, linux-sh-u79uwXL29TY76Z2rM5mHXA,
Viresh Kumar, linux-73nT9ZVIoz3k1uMJSBkQmQ, Matt Porter,
Will Deacon, x86-DgEjT+Ai2ygdnm+yROfE0A, David Howells,
Paul Gortmaker, James Hogan, Mackerras, Helge Deller,
sparclinux-u79uwXL29TY76Z2rM5mHXA,
linux-ia64-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
H. Peter Anvin, Josh Triplett, Jonas Bonn,
linux-s390-u79uwXL29TY76Z2rM5mHXA, Jesper Nilsson, Russell King,
Max Filippov <
This is the whole patch queue for removal of __cpuinit support
against the latest linux-next tree (Jun24th). Some of you may
have already seen chunks of it, or already read the logistics
of what is being done (and why) here:
https://lkml.org/lkml/2013/6/20/513
I won't repeat all that here again, other than to say this send
is to ensure arch/subsystem maintainers get a 2nd chance to know
what is going on and to look at what is being proposed for their
area of code. That, and to ensure one complete continuous copy
of it gets mailed out. You can also see the patch queue here:
http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
If you've noticed that a chunk for MIPS isn't present here, that
is because it has already been queued in the linux-mips for-next
branch.
Thanks,
Paul.
---
Cc: Len Brown <lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: "Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>
Cc: Richard Henderson <rth-hL46jP5Bxq7R7s880joybQ@public.gmane.org>
Cc: Ivan Kokshaysky <ink-biIs/Y0ymYJMZLIVYojuPNP0rXTJTi09@public.gmane.org>
Cc: Matt Turner <mattst88-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Vineet Gupta <vgupta-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
Cc: Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>
Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
Cc: Bob Liu <lliubbo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Sonic Zhang <sonic.zhang-OyLXuOCK7orQT0dZR+AlfA@public.gmane.org>
Cc: Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
Cc: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: "Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>
Cc: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Mikael Starvik <starvik-VrBV9hrLPhE@public.gmane.org>
Cc: Jesper Nilsson <jesper.nilsson-VrBV9hrLPhE@public.gmane.org>
Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
Cc: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Richard Kuo <rkuo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Tony Luck <tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Hirokazu Takata <takata-TMSiXQfHlQjsTix1lMzHGQ@public.gmane.org>
Cc: James Hogan <james.hogan-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>
Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: Rusty Russell <rusty-8n+1lVoiYb80n/F98K4Iww@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: Jonas Bonn <jonas-A9uVI2HLR7kOP4wsBPIw7w@public.gmane.org>
Cc: Helge Deller <deller-Mmb7MZpHnFY@public.gmane.org>
Cc: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: Paul Mackerras <paulus-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
Cc: Josh Boyer <jwboyer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Matt Porter <mporter-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: Kumar Gala <galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: "Paul E. McKenney" <paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Cc: Josh Triplett <josh-CC+yJ3UmIYqDUpFQwHEjaQ@public.gmane.org>
Cc: Dipankar Sarma <dipankar-xthvdsQ13ZrQT0dZR+AlfA@public.gmane.org>
Cc: Martin Schwidefsky <schwidefsky-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
Cc: Heiko Carstens <heiko.carstens-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
Cc: Chen Liqin <liqin.chen-+XGAvkf1AAHby3iVrkZq2A@public.gmane.org>
Cc: Lennox Wu <lennox.wu-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: Chris Metcalf <cmetcalf-kv+TWInifGbQT0dZR+AlfA@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
Cc: Chris Zankel <chris-YvXeqwSYzG2sTnJN9+BGXg@public.gmane.org>
Cc: Max Filippov <jcmvbkbc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: uclinux-dist-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b@public.gmane.org
Cc: cpufreq-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-cris-kernel-VrBV9hrLPhE@public.gmane.org
Cc: linux-hexagon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
Cc: linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy@public.gmane.org
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-ZwoEplunGu2h2975yA52AaxOck334EZe@public.gmane.org
Cc: linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: linux390-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw@public.gmane.org
Paul Gortmaker (32):
init.h: remove __cpuinit sections from the kernel
modpost: remove all traces of cpuinit/cpuexit sections
alpha: delete __cpuinit usage from all users
powerpc: delete __cpuinit usage from all users
parisc: delete __cpuinit usage from all users
ia64: delete __cpuinit usage from all ia64 users
arm: delete __cpuinit/__CPUINIT usage from all ARM users
sparc: delete __cpuinit/__CPUINIT usage from all users
arm64: delete __cpuinit usage from all users
arc: delete __cpuinit usage from all arc files
blackfin: delete __cpuinit usage from all blackfin files
s390: delete __cpuinit usage from all s390 files
sh: delete __cpuinit usage from all sh files
tile: delete __cpuinit usage from all tile files
metag: delete __cpuinit usage from all metag files
cris: delete __cpuinit usage from all cris files
frv: delete __cpuinit usage from all frv files
hexagon: delete __cpuinit usage from all hexagon files
m32r: delete __cpuinit usage from all m32r files
openrisc: delete __cpuinit usage from all openrisc files
xtensa: delete __cpuinit usage from all xtensa files
score: delete __cpuinit usage from all score files
x86: delete __cpuinit usage from all x86 files
clocksource+irqchip: delete __cpuinit usage from all related files
cpufreq: delete __cpuinit usage from all cpufreq files
hwmon: delete __cpuinit usage from all hwmon files
acpi: delete __cpuinit usage from all acpi files
net: delete __cpuinit usage from all net files
rcu: delete __cpuinit usage from all rcu files
kernel: delete __cpuinit usage from all core kernel files
drivers: delete __cpuinit usage from all remaining drivers files
block: delete __cpuinit usage from all block files
Documentation/cpu-hotplug.txt | 6 +--
arch/alpha/kernel/smp.c | 10 ++---
arch/alpha/kernel/traps.c | 4 +-
arch/arc/include/asm/irq.h | 2 +-
arch/arc/kernel/irq.c | 2 +-
arch/arc/kernel/setup.c | 10 ++---
arch/arc/kernel/smp.c | 4 +-
arch/arc/kernel/time.c | 6 +--
arch/arc/mm/cache_arc700.c | 4 +-
arch/arc/mm/tlb.c | 4 +-
arch/arm/common/mcpm_platsmp.c | 4 +-
arch/arm/include/asm/arch_timer.h | 2 +-
arch/arm/kernel/head-common.S | 1 -
arch/arm/kernel/head.S | 1 -
arch/arm/kernel/hw_breakpoint.c | 4 +-
arch/arm/kernel/perf_event_cpu.c | 6 +--
arch/arm/kernel/psci_smp.c | 3 +-
arch/arm/kernel/smp.c | 18 ++++----
arch/arm/kernel/smp_twd.c | 6 +--
arch/arm/lib/delay.c | 2 +-
arch/arm/mach-exynos/headsmp.S | 2 -
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-highbank/platsmp.c | 2 +-
arch/arm/mach-imx/platsmp.c | 2 +-
arch/arm/mach-msm/headsmp.S | 2 -
arch/arm/mach-msm/platsmp.c | 6 +--
arch/arm/mach-msm/timer.c | 4 +-
arch/arm/mach-mvebu/coherency.c | 2 +-
arch/arm/mach-mvebu/headsmp.S | 2 -
arch/arm/mach-mvebu/platsmp.c | 5 +--
arch/arm/mach-omap2/omap-headsmp.S | 2 -
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 4 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
arch/arm/mach-prima2/headsmp.S | 2 -
arch/arm/mach-prima2/platsmp.c | 4 +-
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 2 -
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-socfpga/platsmp.c | 2 +-
arch/arm/mach-spear/generic.h | 2 +-
arch/arm/mach-spear/platsmp.c | 4 +-
arch/arm/mach-tegra/platsmp.c | 4 +-
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 4 +-
arch/arm/mach-zynq/common.h | 2 +-
arch/arm/mach-zynq/headsmp.S | 2 -
arch/arm/mach-zynq/platsmp.c | 6 +--
arch/arm/mm/proc-arm1020.S | 2 -
arch/arm/mm/proc-arm1020e.S | 2 -
arch/arm/mm/proc-arm1022.S | 2 -
arch/arm/mm/proc-arm1026.S | 3 --
arch/arm/mm/proc-arm720.S | 2 -
arch/arm/mm/proc-arm740.S | 2 -
arch/arm/mm/proc-arm7tdmi.S | 2 -
arch/arm/mm/proc-arm920.S | 2 -
arch/arm/mm/proc-arm922.S | 2 -
arch/arm/mm/proc-arm925.S | 2 -
arch/arm/mm/proc-arm926.S | 2 -
arch/arm/mm/proc-arm940.S | 2 -
arch/arm/mm/proc-arm946.S | 2 -
arch/arm/mm/proc-arm9tdmi.S | 2 -
arch/arm/mm/proc-fa526.S | 2 -
arch/arm/mm/proc-feroceon.S | 2 -
arch/arm/mm/proc-mohawk.S | 2 -
arch/arm/mm/proc-sa110.S | 2 -
arch/arm/mm/proc-sa1100.S | 2 -
arch/arm/mm/proc-v6.S | 2 -
arch/arm/mm/proc-v7-2level.S | 4 --
arch/arm/mm/proc-v7-3level.S | 4 --
arch/arm/mm/proc-v7.S | 2 -
arch/arm/mm/proc-xsc3.S | 2 -
arch/arm/mm/proc-xscale.S | 2 -
arch/arm/plat-versatile/platsmp.c | 6 +--
arch/arm64/include/asm/arch_timer.h | 2 +-
arch/arm64/kernel/debug-monitors.c | 6 +--
arch/arm64/kernel/hw_breakpoint.c | 4 +-
arch/arm64/kernel/smp.c | 8 ++--
arch/blackfin/kernel/perf_event.c | 2 +-
arch/blackfin/kernel/setup.c | 4 +-
arch/blackfin/mach-bf561/smp.c | 6 +--
arch/blackfin/mach-common/cache-c.c | 4 +-
arch/blackfin/mach-common/ints-priority.c | 2 +-
arch/blackfin/mach-common/smp.c | 8 ++--
arch/cris/arch-v32/kernel/smp.c | 2 +-
arch/frv/kernel/setup.c | 2 +-
arch/hexagon/kernel/setup.c | 2 +-
arch/hexagon/kernel/smp.c | 4 +-
arch/ia64/kernel/acpi.c | 4 +-
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 | 8 ++--
arch/ia64/kernel/topology.c | 18 ++++----
arch/ia64/mm/contig.c | 3 +-
arch/ia64/mm/discontig.c | 2 +-
arch/ia64/mm/numa.c | 2 +-
arch/ia64/sn/kernel/setup.c | 8 ++--
arch/ia64/xen/hypervisor.c | 2 +-
arch/m32r/kernel/smpboot.c | 2 +-
arch/metag/kernel/perf/perf_event.c | 6 +--
arch/metag/kernel/smp.c | 16 +++----
arch/metag/kernel/traps.c | 2 +-
arch/openrisc/kernel/setup.c | 2 +-
arch/parisc/kernel/firmware.c | 14 +++---
arch/parisc/kernel/hardware.c | 2 +-
arch/parisc/kernel/processor.c | 6 +--
arch/parisc/kernel/smp.c | 8 ++--
arch/powerpc/include/asm/rtas.h | 4 +-
arch/powerpc/include/asm/vdso.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
arch/powerpc/kernel/rtas.c | 4 +-
arch/powerpc/kernel/smp.c | 4 +-
arch/powerpc/kernel/sysfs.c | 6 +--
arch/powerpc/kernel/time.c | 1 -
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 6 +--
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/mmu_context_nohash.c | 6 +--
arch/powerpc/mm/numa.c | 7 ++-
arch/powerpc/mm/tlb_nohash.c | 2 +-
arch/powerpc/perf/core-book3s.c | 4 +-
arch/powerpc/platforms/44x/currituck.c | 4 +-
arch/powerpc/platforms/44x/iss4xx.c | 4 +-
arch/powerpc/platforms/85xx/smp.c | 6 +--
arch/powerpc/platforms/powermac/smp.c | 2 +-
arch/powerpc/platforms/powernv/smp.c | 2 +-
arch/s390/kernel/cache.c | 15 +++----
arch/s390/kernel/perf_cpum_cf.c | 4 +-
arch/s390/kernel/processor.c | 2 +-
arch/s390/kernel/smp.c | 17 ++++---
arch/s390/kernel/sysinfo.c | 2 +-
arch/s390/kernel/vtime.c | 6 +--
arch/s390/mm/fault.c | 4 +-
arch/score/mm/tlb-score.c | 2 +-
arch/sh/kernel/cpu/init.c | 18 ++++----
arch/sh/kernel/cpu/sh2/probe.c | 2 +-
arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
arch/sh/kernel/cpu/sh3/probe.c | 2 +-
arch/sh/kernel/cpu/sh4/probe.c | 2 +-
arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
arch/sh/kernel/cpu/sh5/probe.c | 2 +-
arch/sh/kernel/perf_event.c | 4 +-
arch/sh/kernel/process.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh/kernel/smp.c | 8 ++--
arch/sh/kernel/traps_32.c | 2 +-
arch/sh/kernel/traps_64.c | 2 +-
arch/sh/mm/tlb-sh5.c | 2 +-
arch/sparc/kernel/ds.c | 11 ++---
arch/sparc/kernel/entry.h | 2 +-
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/irq_64.c | 5 ++-
arch/sparc/kernel/leon_smp.c | 10 ++---
arch/sparc/kernel/mdesc.c | 34 +++++++-------
arch/sparc/kernel/smp_32.c | 20 ++++-----
arch/sparc/kernel/smp_64.c | 9 ++--
arch/sparc/kernel/sun4d_smp.c | 6 +--
arch/sparc/kernel/sun4m_smp.c | 6 +--
arch/sparc/kernel/sysfs.c | 4 +-
arch/sparc/kernel/trampoline_32.S | 3 --
arch/sparc/kernel/trampoline_64.S | 2 -
arch/sparc/mm/init_64.c | 2 +-
arch/sparc/mm/srmmu.c | 12 ++---
arch/tile/kernel/irq.c | 2 +-
arch/tile/kernel/messaging.c | 2 +-
arch/tile/kernel/setup.c | 12 ++---
arch/tile/kernel/smpboot.c | 8 ++--
arch/tile/kernel/time.c | 2 +-
arch/x86/include/asm/cpu.h | 2 +-
arch/x86/include/asm/microcode.h | 4 +-
arch/x86/include/asm/microcode_intel.h | 4 +-
arch/x86/include/asm/mmconfig.h | 4 +-
arch/x86/include/asm/mpspec.h | 2 +-
arch/x86/include/asm/numa.h | 6 +--
arch/x86/include/asm/prom.h | 2 +-
arch/x86/include/asm/smp.h | 2 +-
arch/x86/kernel/acpi/boot.c | 6 +--
arch/x86/kernel/apic/apic.c | 30 ++++++-------
arch/x86/kernel/apic/apic_numachip.c | 2 +-
arch/x86/kernel/apic/es7000_32.c | 2 +-
arch/x86/kernel/apic/numaq_32.c | 2 +-
arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
arch/x86/kernel/cpu/amd.c | 33 +++++++-------
arch/x86/kernel/cpu/centaur.c | 26 +++++------
arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
arch/x86/kernel/cpu/hypervisor.c | 2 +-
arch/x86/kernel/cpu/intel.c | 30 ++++++-------
arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
arch/x86/kernel/cpu/perf_event.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
arch/x86/kernel/cpu/rdrand.c | 2 +-
arch/x86/kernel/cpu/scattered.c | 4 +-
arch/x86/kernel/cpu/topology.c | 2 +-
arch/x86/kernel/cpu/transmeta.c | 6 +--
arch/x86/kernel/cpu/umc.c | 2 +-
arch/x86/kernel/cpu/vmware.c | 2 +-
arch/x86/kernel/cpuid.c | 7 ++-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/head_32.S | 1 -
arch/x86/kernel/i387.c | 8 ++--
arch/x86/kernel/irq_32.c | 2 +-
arch/x86/kernel/kvm.c | 10 ++---
arch/x86/kernel/kvmclock.c | 2 +-
arch/x86/kernel/microcode_core.c | 2 +-
arch/x86/kernel/microcode_core_early.c | 6 +--
arch/x86/kernel/microcode_intel_early.c | 26 +++++------
arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
arch/x86/kernel/msr.c | 6 +--
arch/x86/kernel/process.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/smpboot.c | 28 ++++++------
arch/x86/kernel/tboot.c | 6 +--
arch/x86/kernel/tsc.c | 4 +-
arch/x86/kernel/tsc_sync.c | 18 ++++----
arch/x86/kernel/vsyscall_64.c | 6 +--
arch/x86/kernel/x86_init.c | 4 +-
arch/x86/kernel/xsave.c | 4 +-
arch/x86/mm/mmio-mod.c | 4 +-
arch/x86/mm/numa.c | 12 ++---
arch/x86/mm/numa_emulation.c | 12 ++---
arch/x86/mm/setup_nx.c | 4 +-
arch/x86/pci/amd_bus.c | 8 ++--
arch/x86/platform/ce4100/ce4100.c | 2 +-
arch/x86/platform/mrst/mrst.c | 4 +-
arch/x86/xen/enlighten.c | 6 +--
arch/x86/xen/setup.c | 6 +--
arch/x86/xen/smp.c | 12 ++---
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/xen-ops.h | 2 +-
arch/xtensa/kernel/time.c | 2 +-
block/blk-iopoll.c | 6 +--
block/blk-softirq.c | 6 +--
drivers/acpi/acpi_processor.c | 2 +-
drivers/acpi/processor_core.c | 8 ++--
drivers/acpi/processor_driver.c | 8 ++--
drivers/acpi/processor_idle.c | 6 +--
drivers/base/cpu.c | 2 +-
drivers/base/topology.c | 10 ++---
drivers/clocksource/arm_arch_timer.c | 8 ++--
drivers/clocksource/exynos_mct.c | 4 +-
drivers/clocksource/metag_generic.c | 6 +--
drivers/clocksource/time-armada-370-xp.c | 4 +-
drivers/clocksource/timer-marco.c | 4 +-
drivers/cpufreq/cpufreq.c | 4 +-
drivers/cpufreq/cpufreq_stats.c | 4 +-
drivers/cpufreq/dbx500-cpufreq.c | 2 +-
drivers/cpufreq/intel_pstate.c | 4 +-
drivers/cpufreq/longhaul.c | 6 +--
drivers/cpufreq/longhaul.h | 26 +++++------
drivers/cpufreq/longrun.c | 8 ++--
drivers/cpufreq/omap-cpufreq.c | 2 +-
drivers/cpufreq/powernow-k7.c | 8 ++--
drivers/cpufreq/powernow-k8.c | 6 +--
drivers/hwmon/coretemp.c | 39 ++++++++--------
drivers/hwmon/via-cputemp.c | 8 ++--
drivers/irqchip/irq-gic.c | 8 ++--
drivers/oprofile/timer_int.c | 4 +-
drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
include/asm-generic/vmlinux.lds.h | 12 -----
include/linux/cpu.h | 2 +-
include/linux/init.h | 19 ++++----
include/linux/perf_event.h | 2 +-
init/calibrate.c | 13 +++---
kernel/cpu.c | 6 +--
kernel/events/core.c | 4 +-
kernel/fork.c | 2 +-
kernel/hrtimer.c | 6 +--
kernel/printk.c | 2 +-
kernel/profile.c | 2 +-
kernel/rcutorture.c | 6 +--
kernel/rcutree.c | 6 +--
kernel/rcutree.h | 4 +-
kernel/rcutree_plugin.h | 6 +--
kernel/relay.c | 2 +-
kernel/sched/core.c | 12 ++---
kernel/sched/fair.c | 2 +-
kernel/smp.c | 2 +-
kernel/smpboot.c | 2 +-
kernel/softirq.c | 8 ++--
kernel/time/tick-sched.c | 2 +-
kernel/timer.c | 10 ++---
kernel/workqueue.c | 4 +-
lib/Kconfig.debug | 2 +-
lib/earlycpio.c | 2 +-
lib/percpu_counter.c | 2 +-
mm/memcontrol.c | 2 +-
mm/page-writeback.c | 4 +-
mm/slab.c | 10 ++---
mm/slub.c | 4 +-
mm/vmstat.c | 6 +--
net/core/flow.c | 4 +-
net/iucv/iucv.c | 2 +-
scripts/mod/modpost.c | 52 ++++------------------
307 files changed, 896 insertions(+), 1037 deletions(-)
--
1.8.1.2
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
Benjamin Herrenschmidt, linux-sh-u79uwXL29TY76Z2rM5mHXA,
Viresh Kumar, linux-73nT9ZVIoz3k1uMJSBkQmQ, Matt Porter,
Will Deacon, x86-DgEjT+Ai2ygdnm+yROfE0A, David Howells,
Paul Gortmaker, James Hogan, Mackerras, Helge Deller,
sparclinux-u79uwXL29TY76Z2rM5mHXA,
linux-ia64-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
H. Peter Anvin, Josh Triplett, Jonas Bonn,
linux-s390-u79uwXL29TY76Z2rM5mHXA, Jesper Nilsson, Russell King
This is the whole patch queue for removal of __cpuinit support
against the latest linux-next tree (Jun24th). Some of you may
have already seen chunks of it, or already read the logistics
of what is being done (and why) here:
https://lkml.org/lkml/2013/6/20/513
I won't repeat all that here again, other than to say this send
is to ensure arch/subsystem maintainers get a 2nd chance to know
what is going on and to look at what is being proposed for their
area of code. That, and to ensure one complete continuous copy
of it gets mailed out. You can also see the patch queue here:
http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
If you've noticed that a chunk for MIPS isn't present here, that
is because it has already been queued in the linux-mips for-next
branch.
Thanks,
Paul.
---
Cc: Len Brown <lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: "Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>
Cc: Richard Henderson <rth-hL46jP5Bxq7R7s880joybQ@public.gmane.org>
Cc: Ivan Kokshaysky <ink-biIs/Y0ymYJMZLIVYojuPNP0rXTJTi09@public.gmane.org>
Cc: Matt Turner <mattst88-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Vineet Gupta <vgupta-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
Cc: Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>
Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
Cc: Bob Liu <lliubbo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Sonic Zhang <sonic.zhang-OyLXuOCK7orQT0dZR+AlfA@public.gmane.org>
Cc: Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
Cc: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: "Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>
Cc: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Mikael Starvik <starvik-VrBV9hrLPhE@public.gmane.org>
Cc: Jesper Nilsson <jesper.nilsson-VrBV9hrLPhE@public.gmane.org>
Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
Cc: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: Richard Kuo <rkuo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Tony Luck <tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Cc: Hirokazu Takata <takata-TMSiXQfHlQjsTix1lMzHGQ@public.gmane.org>
Cc: James Hogan <james.hogan-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>
Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: Rusty Russell <rusty-8n+1lVoiYb80n/F98K4Iww@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: Jonas Bonn <jonas-A9uVI2HLR7kOP4wsBPIw7w@public.gmane.org>
Cc: Helge Deller <deller-Mmb7MZpHnFY@public.gmane.org>
Cc: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: Paul Mackerras <paulus-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
Cc: Josh Boyer <jwboyer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Matt Porter <mporter-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: Kumar Gala <galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
Cc: "Paul E. McKenney" <paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Cc: Josh Triplett <josh-CC+yJ3UmIYqDUpFQwHEjaQ@public.gmane.org>
Cc: Dipankar Sarma <dipankar-xthvdsQ13ZrQT0dZR+AlfA@public.gmane.org>
Cc: Martin Schwidefsky <schwidefsky-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
Cc: Heiko Carstens <heiko.carstens-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
Cc: Chen Liqin <liqin.chen-+XGAvkf1AAHby3iVrkZq2A@public.gmane.org>
Cc: Lennox Wu <lennox.wu-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>
Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: Chris Metcalf <cmetcalf-kv+TWInifGbQT0dZR+AlfA@public.gmane.org>
Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
Cc: Chris Zankel <chris-YvXeqwSYzG2sTnJN9+BGXg@public.gmane.org>
Cc: Max Filippov <jcmvbkbc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: uclinux-dist-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b@public.gmane.org
Cc: cpufreq-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-cris-kernel-VrBV9hrLPhE@public.gmane.org
Cc: linux-hexagon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
Cc: linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy@public.gmane.org
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-ZwoEplunGu2h2975yA52AaxOck334EZe@public.gmane.org
Cc: linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: linux390-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org
Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw@public.gmane.org
Paul Gortmaker (32):
init.h: remove __cpuinit sections from the kernel
modpost: remove all traces of cpuinit/cpuexit sections
alpha: delete __cpuinit usage from all users
powerpc: delete __cpuinit usage from all users
parisc: delete __cpuinit usage from all users
ia64: delete __cpuinit usage from all ia64 users
arm: delete __cpuinit/__CPUINIT usage from all ARM users
sparc: delete __cpuinit/__CPUINIT usage from all users
arm64: delete __cpuinit usage from all users
arc: delete __cpuinit usage from all arc files
blackfin: delete __cpuinit usage from all blackfin files
s390: delete __cpuinit usage from all s390 files
sh: delete __cpuinit usage from all sh files
tile: delete __cpuinit usage from all tile files
metag: delete __cpuinit usage from all metag files
cris: delete __cpuinit usage from all cris files
frv: delete __cpuinit usage from all frv files
hexagon: delete __cpuinit usage from all hexagon files
m32r: delete __cpuinit usage from all m32r files
openrisc: delete __cpuinit usage from all openrisc files
xtensa: delete __cpuinit usage from all xtensa files
score: delete __cpuinit usage from all score files
x86: delete __cpuinit usage from all x86 files
clocksource+irqchip: delete __cpuinit usage from all related files
cpufreq: delete __cpuinit usage from all cpufreq files
hwmon: delete __cpuinit usage from all hwmon files
acpi: delete __cpuinit usage from all acpi files
net: delete __cpuinit usage from all net files
rcu: delete __cpuinit usage from all rcu files
kernel: delete __cpuinit usage from all core kernel files
drivers: delete __cpuinit usage from all remaining drivers files
block: delete __cpuinit usage from all block files
Documentation/cpu-hotplug.txt | 6 +--
arch/alpha/kernel/smp.c | 10 ++---
arch/alpha/kernel/traps.c | 4 +-
arch/arc/include/asm/irq.h | 2 +-
arch/arc/kernel/irq.c | 2 +-
arch/arc/kernel/setup.c | 10 ++---
arch/arc/kernel/smp.c | 4 +-
arch/arc/kernel/time.c | 6 +--
arch/arc/mm/cache_arc700.c | 4 +-
arch/arc/mm/tlb.c | 4 +-
arch/arm/common/mcpm_platsmp.c | 4 +-
arch/arm/include/asm/arch_timer.h | 2 +-
arch/arm/kernel/head-common.S | 1 -
arch/arm/kernel/head.S | 1 -
arch/arm/kernel/hw_breakpoint.c | 4 +-
arch/arm/kernel/perf_event_cpu.c | 6 +--
arch/arm/kernel/psci_smp.c | 3 +-
arch/arm/kernel/smp.c | 18 ++++----
arch/arm/kernel/smp_twd.c | 6 +--
arch/arm/lib/delay.c | 2 +-
arch/arm/mach-exynos/headsmp.S | 2 -
arch/arm/mach-exynos/platsmp.c | 4 +-
arch/arm/mach-highbank/platsmp.c | 2 +-
arch/arm/mach-imx/platsmp.c | 2 +-
arch/arm/mach-msm/headsmp.S | 2 -
arch/arm/mach-msm/platsmp.c | 6 +--
arch/arm/mach-msm/timer.c | 4 +-
arch/arm/mach-mvebu/coherency.c | 2 +-
arch/arm/mach-mvebu/headsmp.S | 2 -
arch/arm/mach-mvebu/platsmp.c | 5 +--
arch/arm/mach-omap2/omap-headsmp.S | 2 -
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 4 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
arch/arm/mach-prima2/headsmp.S | 2 -
arch/arm/mach-prima2/platsmp.c | 4 +-
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 2 -
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-socfpga/platsmp.c | 2 +-
arch/arm/mach-spear/generic.h | 2 +-
arch/arm/mach-spear/platsmp.c | 4 +-
arch/arm/mach-tegra/platsmp.c | 4 +-
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 4 +-
arch/arm/mach-zynq/common.h | 2 +-
arch/arm/mach-zynq/headsmp.S | 2 -
arch/arm/mach-zynq/platsmp.c | 6 +--
arch/arm/mm/proc-arm1020.S | 2 -
arch/arm/mm/proc-arm1020e.S | 2 -
arch/arm/mm/proc-arm1022.S | 2 -
arch/arm/mm/proc-arm1026.S | 3 --
arch/arm/mm/proc-arm720.S | 2 -
arch/arm/mm/proc-arm740.S | 2 -
arch/arm/mm/proc-arm7tdmi.S | 2 -
arch/arm/mm/proc-arm920.S | 2 -
arch/arm/mm/proc-arm922.S | 2 -
arch/arm/mm/proc-arm925.S | 2 -
arch/arm/mm/proc-arm926.S | 2 -
arch/arm/mm/proc-arm940.S | 2 -
arch/arm/mm/proc-arm946.S | 2 -
arch/arm/mm/proc-arm9tdmi.S | 2 -
arch/arm/mm/proc-fa526.S | 2 -
arch/arm/mm/proc-feroceon.S | 2 -
arch/arm/mm/proc-mohawk.S | 2 -
arch/arm/mm/proc-sa110.S | 2 -
arch/arm/mm/proc-sa1100.S | 2 -
arch/arm/mm/proc-v6.S | 2 -
arch/arm/mm/proc-v7-2level.S | 4 --
arch/arm/mm/proc-v7-3level.S | 4 --
arch/arm/mm/proc-v7.S | 2 -
arch/arm/mm/proc-xsc3.S | 2 -
arch/arm/mm/proc-xscale.S | 2 -
arch/arm/plat-versatile/platsmp.c | 6 +--
arch/arm64/include/asm/arch_timer.h | 2 +-
arch/arm64/kernel/debug-monitors.c | 6 +--
arch/arm64/kernel/hw_breakpoint.c | 4 +-
arch/arm64/kernel/smp.c | 8 ++--
arch/blackfin/kernel/perf_event.c | 2 +-
arch/blackfin/kernel/setup.c | 4 +-
arch/blackfin/mach-bf561/smp.c | 6 +--
arch/blackfin/mach-common/cache-c.c | 4 +-
arch/blackfin/mach-common/ints-priority.c | 2 +-
arch/blackfin/mach-common/smp.c | 8 ++--
arch/cris/arch-v32/kernel/smp.c | 2 +-
arch/frv/kernel/setup.c | 2 +-
arch/hexagon/kernel/setup.c | 2 +-
arch/hexagon/kernel/smp.c | 4 +-
arch/ia64/kernel/acpi.c | 4 +-
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 | 8 ++--
arch/ia64/kernel/topology.c | 18 ++++----
arch/ia64/mm/contig.c | 3 +-
arch/ia64/mm/discontig.c | 2 +-
arch/ia64/mm/numa.c | 2 +-
arch/ia64/sn/kernel/setup.c | 8 ++--
arch/ia64/xen/hypervisor.c | 2 +-
arch/m32r/kernel/smpboot.c | 2 +-
arch/metag/kernel/perf/perf_event.c | 6 +--
arch/metag/kernel/smp.c | 16 +++----
arch/metag/kernel/traps.c | 2 +-
arch/openrisc/kernel/setup.c | 2 +-
arch/parisc/kernel/firmware.c | 14 +++---
arch/parisc/kernel/hardware.c | 2 +-
arch/parisc/kernel/processor.c | 6 +--
arch/parisc/kernel/smp.c | 8 ++--
arch/powerpc/include/asm/rtas.h | 4 +-
arch/powerpc/include/asm/vdso.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
arch/powerpc/kernel/rtas.c | 4 +-
arch/powerpc/kernel/smp.c | 4 +-
arch/powerpc/kernel/sysfs.c | 6 +--
arch/powerpc/kernel/time.c | 1 -
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 6 +--
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/mmu_context_nohash.c | 6 +--
arch/powerpc/mm/numa.c | 7 ++-
arch/powerpc/mm/tlb_nohash.c | 2 +-
arch/powerpc/perf/core-book3s.c | 4 +-
arch/powerpc/platforms/44x/currituck.c | 4 +-
arch/powerpc/platforms/44x/iss4xx.c | 4 +-
arch/powerpc/platforms/85xx/smp.c | 6 +--
arch/powerpc/platforms/powermac/smp.c | 2 +-
arch/powerpc/platforms/powernv/smp.c | 2 +-
arch/s390/kernel/cache.c | 15 +++----
arch/s390/kernel/perf_cpum_cf.c | 4 +-
arch/s390/kernel/processor.c | 2 +-
arch/s390/kernel/smp.c | 17 ++++---
arch/s390/kernel/sysinfo.c | 2 +-
arch/s390/kernel/vtime.c | 6 +--
arch/s390/mm/fault.c | 4 +-
arch/score/mm/tlb-score.c | 2 +-
arch/sh/kernel/cpu/init.c | 18 ++++----
arch/sh/kernel/cpu/sh2/probe.c | 2 +-
arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
arch/sh/kernel/cpu/sh3/probe.c | 2 +-
arch/sh/kernel/cpu/sh4/probe.c | 2 +-
arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
arch/sh/kernel/cpu/sh5/probe.c | 2 +-
arch/sh/kernel/perf_event.c | 4 +-
arch/sh/kernel/process.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh/kernel/smp.c | 8 ++--
arch/sh/kernel/traps_32.c | 2 +-
arch/sh/kernel/traps_64.c | 2 +-
arch/sh/mm/tlb-sh5.c | 2 +-
arch/sparc/kernel/ds.c | 11 ++---
arch/sparc/kernel/entry.h | 2 +-
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/irq_64.c | 5 ++-
arch/sparc/kernel/leon_smp.c | 10 ++---
arch/sparc/kernel/mdesc.c | 34 +++++++-------
arch/sparc/kernel/smp_32.c | 20 ++++-----
arch/sparc/kernel/smp_64.c | 9 ++--
arch/sparc/kernel/sun4d_smp.c | 6 +--
arch/sparc/kernel/sun4m_smp.c | 6 +--
arch/sparc/kernel/sysfs.c | 4 +-
arch/sparc/kernel/trampoline_32.S | 3 --
arch/sparc/kernel/trampoline_64.S | 2 -
arch/sparc/mm/init_64.c | 2 +-
arch/sparc/mm/srmmu.c | 12 ++---
arch/tile/kernel/irq.c | 2 +-
arch/tile/kernel/messaging.c | 2 +-
arch/tile/kernel/setup.c | 12 ++---
arch/tile/kernel/smpboot.c | 8 ++--
arch/tile/kernel/time.c | 2 +-
arch/x86/include/asm/cpu.h | 2 +-
arch/x86/include/asm/microcode.h | 4 +-
arch/x86/include/asm/microcode_intel.h | 4 +-
arch/x86/include/asm/mmconfig.h | 4 +-
arch/x86/include/asm/mpspec.h | 2 +-
arch/x86/include/asm/numa.h | 6 +--
arch/x86/include/asm/prom.h | 2 +-
arch/x86/include/asm/smp.h | 2 +-
arch/x86/kernel/acpi/boot.c | 6 +--
arch/x86/kernel/apic/apic.c | 30 ++++++-------
arch/x86/kernel/apic/apic_numachip.c | 2 +-
arch/x86/kernel/apic/es7000_32.c | 2 +-
arch/x86/kernel/apic/numaq_32.c | 2 +-
arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
arch/x86/kernel/cpu/amd.c | 33 +++++++-------
arch/x86/kernel/cpu/centaur.c | 26 +++++------
arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
arch/x86/kernel/cpu/hypervisor.c | 2 +-
arch/x86/kernel/cpu/intel.c | 30 ++++++-------
arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
arch/x86/kernel/cpu/perf_event.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
arch/x86/kernel/cpu/rdrand.c | 2 +-
arch/x86/kernel/cpu/scattered.c | 4 +-
arch/x86/kernel/cpu/topology.c | 2 +-
arch/x86/kernel/cpu/transmeta.c | 6 +--
arch/x86/kernel/cpu/umc.c | 2 +-
arch/x86/kernel/cpu/vmware.c | 2 +-
arch/x86/kernel/cpuid.c | 7 ++-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/head_32.S | 1 -
arch/x86/kernel/i387.c | 8 ++--
arch/x86/kernel/irq_32.c | 2 +-
arch/x86/kernel/kvm.c | 10 ++---
arch/x86/kernel/kvmclock.c | 2 +-
arch/x86/kernel/microcode_core.c | 2 +-
arch/x86/kernel/microcode_core_early.c | 6 +--
arch/x86/kernel/microcode_intel_early.c | 26 +++++------
arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
arch/x86/kernel/msr.c | 6 +--
arch/x86/kernel/process.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/smpboot.c | 28 ++++++------
arch/x86/kernel/tboot.c | 6 +--
arch/x86/kernel/tsc.c | 4 +-
arch/x86/kernel/tsc_sync.c | 18 ++++----
arch/x86/kernel/vsyscall_64.c | 6 +--
arch/x86/kernel/x86_init.c | 4 +-
arch/x86/kernel/xsave.c | 4 +-
arch/x86/mm/mmio-mod.c | 4 +-
arch/x86/mm/numa.c | 12 ++---
arch/x86/mm/numa_emulation.c | 12 ++---
arch/x86/mm/setup_nx.c | 4 +-
arch/x86/pci/amd_bus.c | 8 ++--
arch/x86/platform/ce4100/ce4100.c | 2 +-
arch/x86/platform/mrst/mrst.c | 4 +-
arch/x86/xen/enlighten.c | 6 +--
arch/x86/xen/setup.c | 6 +--
arch/x86/xen/smp.c | 12 ++---
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/xen-ops.h | 2 +-
arch/xtensa/kernel/time.c | 2 +-
block/blk-iopoll.c | 6 +--
block/blk-softirq.c | 6 +--
drivers/acpi/acpi_processor.c | 2 +-
drivers/acpi/processor_core.c | 8 ++--
drivers/acpi/processor_driver.c | 8 ++--
drivers/acpi/processor_idle.c | 6 +--
drivers/base/cpu.c | 2 +-
drivers/base/topology.c | 10 ++---
drivers/clocksource/arm_arch_timer.c | 8 ++--
drivers/clocksource/exynos_mct.c | 4 +-
drivers/clocksource/metag_generic.c | 6 +--
drivers/clocksource/time-armada-370-xp.c | 4 +-
drivers/clocksource/timer-marco.c | 4 +-
drivers/cpufreq/cpufreq.c | 4 +-
drivers/cpufreq/cpufreq_stats.c | 4 +-
drivers/cpufreq/dbx500-cpufreq.c | 2 +-
drivers/cpufreq/intel_pstate.c | 4 +-
drivers/cpufreq/longhaul.c | 6 +--
drivers/cpufreq/longhaul.h | 26 +++++------
drivers/cpufreq/longrun.c | 8 ++--
drivers/cpufreq/omap-cpufreq.c | 2 +-
drivers/cpufreq/powernow-k7.c | 8 ++--
drivers/cpufreq/powernow-k8.c | 6 +--
drivers/hwmon/coretemp.c | 39 ++++++++--------
drivers/hwmon/via-cputemp.c | 8 ++--
drivers/irqchip/irq-gic.c | 8 ++--
drivers/oprofile/timer_int.c | 4 +-
drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
include/asm-generic/vmlinux.lds.h | 12 -----
include/linux/cpu.h | 2 +-
include/linux/init.h | 19 ++++----
include/linux/perf_event.h | 2 +-
init/calibrate.c | 13 +++---
kernel/cpu.c | 6 +--
kernel/events/core.c | 4 +-
kernel/fork.c | 2 +-
kernel/hrtimer.c | 6 +--
kernel/printk.c | 2 +-
kernel/profile.c | 2 +-
kernel/rcutorture.c | 6 +--
kernel/rcutree.c | 6 +--
kernel/rcutree.h | 4 +-
kernel/rcutree_plugin.h | 6 +--
kernel/relay.c | 2 +-
kernel/sched/core.c | 12 ++---
kernel/sched/fair.c | 2 +-
kernel/smp.c | 2 +-
kernel/smpboot.c | 2 +-
kernel/softirq.c | 8 ++--
kernel/time/tick-sched.c | 2 +-
kernel/timer.c | 10 ++---
kernel/workqueue.c | 4 +-
lib/Kconfig.debug | 2 +-
lib/earlycpio.c | 2 +-
lib/percpu_counter.c | 2 +-
mm/memcontrol.c | 2 +-
mm/page-writeback.c | 4 +-
mm/slab.c | 10 ++---
mm/slub.c | 4 +-
mm/vmstat.c | 6 +--
net/core/flow.c | 4 +-
net/iucv/iucv.c | 2 +-
scripts/mod/modpost.c | 52 ++++------------------
307 files changed, 896 insertions(+), 1037 deletions(-)
--
1.8.1.2
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 01/32] init.h: remove __cpuinit sections from the kernel
2013-06-24 19:30 ` Paul Gortmaker
` (3 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-24 19:51 ` Joe Perches
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
As an interim step, we can dummy out the macros to be no-ops, and
this will allow us to avoid a giant tree-wide patch, and instead
we can feed in smaller chunks mainly via the arch/ trees. This
is in keeping with commit 78d86c213f28193082b5d8a1a424044b7ba406f1
("init.h: Remove __dev* sections from the kernel")
We don't strictly need to dummy out the macros to do this, but if
we don't then some harmless section mismatch warnings may temporarily
result. For example, notify_cpu_starting() and cpu_up() are arch
independent (kernel/cpu.c) and are flagged as __cpuinit. And hence
the calling functions in the arch specific code are also expected
to be __cpuinit -- if not, then we get the section mismatch warning.
Two of the three __CPUINIT variants are not used whatsoever, and
so they are simply removed directly at this point in time.
[1] https://lkml.org/lkml/2013/5/20/589
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
include/linux/init.h | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/linux/init.h b/include/linux/init.h
index 8618147..e73f2b7 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -93,13 +93,13 @@
#define __exit __section(.exit.text) __exitused __cold notrace
-/* Used for HOTPLUG_CPU */
-#define __cpuinit __section(.cpuinit.text) __cold notrace
-#define __cpuinitdata __section(.cpuinit.data)
-#define __cpuinitconst __constsection(.cpuinit.rodata)
-#define __cpuexit __section(.cpuexit.text) __exitused __cold notrace
-#define __cpuexitdata __section(.cpuexit.data)
-#define __cpuexitconst __constsection(.cpuexit.rodata)
+/* temporary, until all users are removed */
+#define __cpuinit
+#define __cpuinitdata
+#define __cpuinitconst
+#define __cpuexit
+#define __cpuexitdata
+#define __cpuexitconst
/* Used for MEMORY_HOTPLUG */
#define __meminit __section(.meminit.text) __cold notrace
@@ -118,9 +118,8 @@
#define __INITRODATA .section ".init.rodata","a",%progbits
#define __FINITDATA .previous
-#define __CPUINIT .section ".cpuinit.text", "ax"
-#define __CPUINITDATA .section ".cpuinit.data", "aw"
-#define __CPUINITRODATA .section ".cpuinit.rodata", "a"
+/* temporary, until all users are removed */
+#define __CPUINIT
#define __MEMINIT .section ".meminit.text", "ax"
#define __MEMINITDATA .section ".meminit.data", "aw"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 01/32] init.h: remove __cpuinit sections from the kernel
2013-06-24 19:30 ` [PATCH 01/32] init.h: remove __cpuinit sections from the kernel Paul Gortmaker
@ 2013-06-24 19:51 ` Joe Perches
2013-06-24 22:10 ` Joe Perches
0 siblings, 1 reply; 88+ messages in thread
From: Joe Perches @ 2013-06-24 19:51 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, linux-embedded
On Mon, 2013-06-24 at 15:30 -0400, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
Hi Paul.
Could you please post the sizes of a generic kernel build
with and without this?
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 01/32] init.h: remove __cpuinit sections from the kernel
2013-06-24 19:51 ` Joe Perches
@ 2013-06-24 22:10 ` Joe Perches
0 siblings, 0 replies; 88+ messages in thread
From: Joe Perches @ 2013-06-24 22:10 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, linux-embedded
On Mon, 2013-06-24 at 12:51 -0700, Joe Perches wrote:
> On Mon, 2013-06-24 at 15:30 -0400, Paul Gortmaker wrote:
> > The __cpuinit type of throwaway sections might have made sense
> > some time ago when RAM was more constrained, but now the savings
> > do not offset the cost and complications. For example, the fix in
> > commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> > is a good example of the nasty type of bugs that can be created
> > with improper use of the various __init prefixes.
>
> Hi Paul.
>
> Could you please post the sizes of a generic kernel build
> with and without this?
Nevermind...
I just checked using readelf -S.
Seems sensible to me.
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 02/32] modpost: remove all traces of cpuinit/cpuexit sections
2013-06-24 19:30 ` Paul Gortmaker
` (4 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Arnd Bergmann, Rusty Russell
Delete all audit rules that were checking how the .cpuXYZ
related sections were inter-operating with other __init
like sections, now that __cpuinit is gone. Update the linker
script to not have any knowledge of .cpuinit sections.
[lds.h update courtesy of Ralf Baechle <ralf@linux-mips.org>]
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
include/asm-generic/vmlinux.lds.h | 12 ---------
scripts/mod/modpost.c | 52 +++++++--------------------------------
2 files changed, 9 insertions(+), 55 deletions(-)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 4f27372..796f470 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -174,8 +174,6 @@
*(.data) \
*(.ref.data) \
*(.data..shared_aligned) /* percpu related */ \
- CPU_KEEP(init.data) \
- CPU_KEEP(exit.data) \
MEM_KEEP(init.data) \
MEM_KEEP(exit.data) \
*(.data.unlikely) \
@@ -362,8 +360,6 @@
/* __*init sections */ \
__init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \
*(.ref.rodata) \
- CPU_KEEP(init.rodata) \
- CPU_KEEP(exit.rodata) \
MEM_KEEP(init.rodata) \
MEM_KEEP(exit.rodata) \
} \
@@ -404,8 +400,6 @@
*(.text.hot) \
*(.text) \
*(.ref.text) \
- CPU_KEEP(init.text) \
- CPU_KEEP(exit.text) \
MEM_KEEP(init.text) \
MEM_KEEP(exit.text) \
*(.text.unlikely)
@@ -489,14 +483,12 @@
/* init and exit section handling */
#define INIT_DATA \
*(.init.data) \
- CPU_DISCARD(init.data) \
MEM_DISCARD(init.data) \
KERNEL_CTORS() \
MCOUNT_REC() \
*(.init.rodata) \
FTRACE_EVENTS() \
TRACE_SYSCALLS() \
- CPU_DISCARD(init.rodata) \
MEM_DISCARD(init.rodata) \
CLK_OF_TABLES() \
CLKSRC_OF_TABLES() \
@@ -505,19 +497,15 @@
#define INIT_TEXT \
*(.init.text) \
- CPU_DISCARD(init.text) \
MEM_DISCARD(init.text)
#define EXIT_DATA \
*(.exit.data) \
- CPU_DISCARD(exit.data) \
- CPU_DISCARD(exit.rodata) \
MEM_DISCARD(exit.data) \
MEM_DISCARD(exit.rodata)
#define EXIT_TEXT \
*(.exit.text) \
- CPU_DISCARD(exit.text) \
MEM_DISCARD(exit.text)
#define EXIT_CALL \
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 3d155dd..6216434 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -861,24 +861,23 @@ static void check_section(const char *modname, struct elf_info *elf,
#define ALL_INIT_DATA_SECTIONS \
- ".init.setup$", ".init.rodata$", \
- ".cpuinit.rodata$", ".meminit.rodata$", \
- ".init.data$", ".cpuinit.data$", ".meminit.data$"
+ ".init.setup$", ".init.rodata$", ".meminit.rodata$", \
+ ".init.data$", ".meminit.data$"
#define ALL_EXIT_DATA_SECTIONS \
- ".exit.data$", ".cpuexit.data$", ".memexit.data$"
+ ".exit.data$", ".memexit.data$"
#define ALL_INIT_TEXT_SECTIONS \
- ".init.text$", ".cpuinit.text$", ".meminit.text$"
+ ".init.text$", ".meminit.text$"
#define ALL_EXIT_TEXT_SECTIONS \
- ".exit.text$", ".cpuexit.text$", ".memexit.text$"
+ ".exit.text$", ".memexit.text$"
#define ALL_PCI_INIT_SECTIONS \
".pci_fixup_early$", ".pci_fixup_header$", ".pci_fixup_final$", \
".pci_fixup_enable$", ".pci_fixup_resume$", \
".pci_fixup_resume_early$", ".pci_fixup_suspend$"
-#define ALL_XXXINIT_SECTIONS CPU_INIT_SECTIONS, MEM_INIT_SECTIONS
-#define ALL_XXXEXIT_SECTIONS CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS
+#define ALL_XXXINIT_SECTIONS MEM_INIT_SECTIONS
+#define ALL_XXXEXIT_SECTIONS MEM_EXIT_SECTIONS
#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
@@ -887,11 +886,9 @@ static void check_section(const char *modname, struct elf_info *elf,
#define TEXT_SECTIONS ".text$", ".text.unlikely$"
#define INIT_SECTIONS ".init.*"
-#define CPU_INIT_SECTIONS ".cpuinit.*"
#define MEM_INIT_SECTIONS ".meminit.*"
#define EXIT_SECTIONS ".exit.*"
-#define CPU_EXIT_SECTIONS ".cpuexit.*"
#define MEM_EXIT_SECTIONS ".memexit.*"
/* init data sections */
@@ -979,48 +976,20 @@ const struct sectioncheck sectioncheck[] = {
.mismatch = DATA_TO_ANY_EXIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
},
-/* Do not reference init code/data from cpuinit/meminit code/data */
+/* Do not reference init code/data from meminit code/data */
{
.fromsec = { ALL_XXXINIT_SECTIONS, NULL },
.tosec = { INIT_SECTIONS, NULL },
.mismatch = XXXINIT_TO_SOME_INIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
},
-/* Do not reference cpuinit code/data from meminit code/data */
-{
- .fromsec = { MEM_INIT_SECTIONS, NULL },
- .tosec = { CPU_INIT_SECTIONS, NULL },
- .mismatch = XXXINIT_TO_SOME_INIT,
- .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
-/* Do not reference meminit code/data from cpuinit code/data */
-{
- .fromsec = { CPU_INIT_SECTIONS, NULL },
- .tosec = { MEM_INIT_SECTIONS, NULL },
- .mismatch = XXXINIT_TO_SOME_INIT,
- .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
-/* Do not reference exit code/data from cpuexit/memexit code/data */
+/* Do not reference exit code/data from memexit code/data */
{
.fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
.tosec = { EXIT_SECTIONS, NULL },
.mismatch = XXXEXIT_TO_SOME_EXIT,
.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
},
-/* Do not reference cpuexit code/data from memexit code/data */
-{
- .fromsec = { MEM_EXIT_SECTIONS, NULL },
- .tosec = { CPU_EXIT_SECTIONS, NULL },
- .mismatch = XXXEXIT_TO_SOME_EXIT,
- .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
-/* Do not reference memexit code/data from cpuexit code/data */
-{
- .fromsec = { CPU_EXIT_SECTIONS, NULL },
- .tosec = { MEM_EXIT_SECTIONS, NULL },
- .mismatch = XXXEXIT_TO_SOME_EXIT,
- .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
-},
/* Do not use exit code/data from init code */
{
.fromsec = { ALL_INIT_SECTIONS, NULL },
@@ -1089,8 +1058,6 @@ static const struct sectioncheck *section_mismatch(
* Pattern 2:
* Many drivers utilise a *driver container with references to
* add, remove, probe functions etc.
- * These functions may often be marked __cpuinit and we do not want to
- * warn here.
* the pattern is identified by:
* tosec = init or exit section
* fromsec = data section
@@ -1249,7 +1216,6 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
/*
* Convert a section name to the function/data attribute
* .init.text => __init
- * .cpuinit.data => __cpudata
* .memexitconst => __memconst
* etc.
*
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 03/32] alpha: delete __cpuinit usage from all users
2013-06-24 19:30 ` Paul Gortmaker
` (5 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Richard Henderson, Ivan Kokshaysky, Matt Turner
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the alpha uses of the __cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/alpha/kernel/smp.c | 10 +++++-----
arch/alpha/kernel/traps.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 7b60834..53b18a6 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -116,7 +116,7 @@ wait_boot_cpu_to_stop(int cpuid)
/*
* Where secondaries begin a life of C.
*/
-void __cpuinit
+void
smp_callin(void)
{
int cpuid = hard_smp_processor_id();
@@ -194,7 +194,7 @@ wait_for_txrdy (unsigned long cpumask)
* Send a message to a secondary's console. "START" is one such
* interesting message. ;-)
*/
-static void __cpuinit
+static void
send_secondary_console_msg(char *str, int cpuid)
{
struct percpu_struct *cpu;
@@ -285,7 +285,7 @@ recv_secondary_console_msg(void)
/*
* Convince the console to have a secondary cpu begin execution.
*/
-static int __cpuinit
+static int
secondary_cpu_start(int cpuid, struct task_struct *idle)
{
struct percpu_struct *cpu;
@@ -356,7 +356,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)
{
unsigned long timeout;
@@ -472,7 +472,7 @@ smp_prepare_boot_cpu(void)
{
}
-int __cpuinit
+int
__cpu_up(unsigned int cpu, struct task_struct *tidle)
{
smp_boot_one_cpu(cpu, tidle);
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index affccb9..be1fba3 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -32,7 +32,7 @@
static int opDEC_fix;
-static void __cpuinit
+static void
opDEC_check(void)
{
__asm__ __volatile__ (
@@ -1059,7 +1059,7 @@ give_sigbus:
return;
}
-void __cpuinit
+void
trap_init(void)
{
/* Tell PAL-code what global pointer we want in the kernel. */
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 04/32] powerpc: delete __cpuinit usage from all users
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Paul Mackerras, linuxppc-dev
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the powerpc uses of the __cpuinit macros. There
are no __CPUINIT users in assembly files in powerpc.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/powerpc/include/asm/rtas.h | 4 ++--
arch/powerpc/include/asm/vdso.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 36 ++++++++++++++++++++--------------
arch/powerpc/kernel/rtas.c | 4 ++--
arch/powerpc/kernel/smp.c | 4 ++--
arch/powerpc/kernel/sysfs.c | 6 +++---
arch/powerpc/kernel/time.c | 1 -
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 6 +++---
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/mmu_context_nohash.c | 6 +++---
arch/powerpc/mm/numa.c | 7 +++----
arch/powerpc/mm/tlb_nohash.c | 2 +-
arch/powerpc/perf/core-book3s.c | 4 ++--
arch/powerpc/platforms/44x/currituck.c | 4 ++--
arch/powerpc/platforms/44x/iss4xx.c | 4 ++--
arch/powerpc/platforms/85xx/smp.c | 6 +++---
arch/powerpc/platforms/powermac/smp.c | 2 +-
arch/powerpc/platforms/powernv/smp.c | 2 +-
19 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 34fd704..c7a8bfc 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -350,8 +350,8 @@ static inline u32 rtas_config_addr(int busno, int devfn, int reg)
(devfn << 8) | (reg & 0xff);
}
-extern void __cpuinit rtas_give_timebase(void);
-extern void __cpuinit rtas_take_timebase(void);
+extern void rtas_give_timebase(void);
+extern void rtas_take_timebase(void);
#ifdef CONFIG_PPC_RTAS
static inline int page_is_rtas_user_buf(unsigned long pfn)
diff --git a/arch/powerpc/include/asm/vdso.h b/arch/powerpc/include/asm/vdso.h
index 50f261b..0d9cecd 100644
--- a/arch/powerpc/include/asm/vdso.h
+++ b/arch/powerpc/include/asm/vdso.h
@@ -22,7 +22,7 @@ extern unsigned long vdso64_rt_sigtramp;
extern unsigned long vdso32_sigtramp;
extern unsigned long vdso32_rt_sigtramp;
-int __cpuinit vdso_getcpu_init(void);
+int vdso_getcpu_init(void);
#else /* __ASSEMBLY__ */
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index 92c6b00..9262cf2 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -131,7 +131,8 @@ static const char *cache_type_string(const struct cache *cache)
return cache_type_info[cache->type].name;
}
-static void __cpuinit cache_init(struct cache *cache, int type, int level, struct device_node *ofnode)
+static void cache_init(struct cache *cache, int type, int level,
+ struct device_node *ofnode)
{
cache->type = type;
cache->level = level;
@@ -140,7 +141,7 @@ static void __cpuinit cache_init(struct cache *cache, int type, int level, struc
list_add(&cache->list, &cache_list);
}
-static struct cache *__cpuinit new_cache(int type, int level, struct device_node *ofnode)
+static struct cache *new_cache(int type, int level, struct device_node *ofnode)
{
struct cache *cache;
@@ -324,7 +325,8 @@ static bool cache_node_is_unified(const struct device_node *np)
return of_get_property(np, "cache-unified", NULL);
}
-static struct cache *__cpuinit cache_do_one_devnode_unified(struct device_node *node, int level)
+static struct cache *cache_do_one_devnode_unified(struct device_node *node,
+ int level)
{
struct cache *cache;
@@ -335,7 +337,8 @@ static struct cache *__cpuinit cache_do_one_devnode_unified(struct device_node *
return cache;
}
-static struct cache *__cpuinit cache_do_one_devnode_split(struct device_node *node, int level)
+static struct cache *cache_do_one_devnode_split(struct device_node *node,
+ int level)
{
struct cache *dcache, *icache;
@@ -357,7 +360,7 @@ err:
return NULL;
}
-static struct cache *__cpuinit cache_do_one_devnode(struct device_node *node, int level)
+static struct cache *cache_do_one_devnode(struct device_node *node, int level)
{
struct cache *cache;
@@ -369,7 +372,8 @@ static struct cache *__cpuinit cache_do_one_devnode(struct device_node *node, in
return cache;
}
-static struct cache *__cpuinit cache_lookup_or_instantiate(struct device_node *node, int level)
+static struct cache *cache_lookup_or_instantiate(struct device_node *node,
+ int level)
{
struct cache *cache;
@@ -385,7 +389,7 @@ static struct cache *__cpuinit cache_lookup_or_instantiate(struct device_node *n
return cache;
}
-static void __cpuinit link_cache_lists(struct cache *smaller, struct cache *bigger)
+static void link_cache_lists(struct cache *smaller, struct cache *bigger)
{
while (smaller->next_local) {
if (smaller->next_local == bigger)
@@ -396,13 +400,13 @@ static void __cpuinit link_cache_lists(struct cache *smaller, struct cache *bigg
smaller->next_local = bigger;
}
-static void __cpuinit do_subsidiary_caches_debugcheck(struct cache *cache)
+static void do_subsidiary_caches_debugcheck(struct cache *cache)
{
WARN_ON_ONCE(cache->level != 1);
WARN_ON_ONCE(strcmp(cache->ofnode->type, "cpu"));
}
-static void __cpuinit do_subsidiary_caches(struct cache *cache)
+static void do_subsidiary_caches(struct cache *cache)
{
struct device_node *subcache_node;
int level = cache->level;
@@ -423,7 +427,7 @@ static void __cpuinit do_subsidiary_caches(struct cache *cache)
}
}
-static struct cache *__cpuinit cache_chain_instantiate(unsigned int cpu_id)
+static struct cache *cache_chain_instantiate(unsigned int cpu_id)
{
struct device_node *cpu_node;
struct cache *cpu_cache = NULL;
@@ -448,7 +452,7 @@ out:
return cpu_cache;
}
-static struct cache_dir *__cpuinit cacheinfo_create_cache_dir(unsigned int cpu_id)
+static struct cache_dir *cacheinfo_create_cache_dir(unsigned int cpu_id)
{
struct cache_dir *cache_dir;
struct device *dev;
@@ -653,7 +657,7 @@ static struct kobj_type cache_index_type = {
.default_attrs = cache_index_default_attrs,
};
-static void __cpuinit cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)
+static void cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)
{
const char *cache_name;
const char *cache_type;
@@ -696,7 +700,8 @@ static void __cpuinit cacheinfo_create_index_opt_attrs(struct cache_index_dir *d
kfree(buf);
}
-static void __cpuinit cacheinfo_create_index_dir(struct cache *cache, int index, struct cache_dir *cache_dir)
+static void cacheinfo_create_index_dir(struct cache *cache, int index,
+ struct cache_dir *cache_dir)
{
struct cache_index_dir *index_dir;
int rc;
@@ -722,7 +727,8 @@ err:
kfree(index_dir);
}
-static void __cpuinit cacheinfo_sysfs_populate(unsigned int cpu_id, struct cache *cache_list)
+static void cacheinfo_sysfs_populate(unsigned int cpu_id,
+ struct cache *cache_list)
{
struct cache_dir *cache_dir;
struct cache *cache;
@@ -740,7 +746,7 @@ static void __cpuinit cacheinfo_sysfs_populate(unsigned int cpu_id, struct cache
}
}
-void __cpuinit cacheinfo_cpu_online(unsigned int cpu_id)
+void cacheinfo_cpu_online(unsigned int cpu_id)
{
struct cache *cache;
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 52add6f..80b5ef4 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -1172,7 +1172,7 @@ int __init early_init_dt_scan_rtas(unsigned long node,
static arch_spinlock_t timebase_lock;
static u64 timebase = 0;
-void __cpuinit rtas_give_timebase(void)
+void rtas_give_timebase(void)
{
unsigned long flags;
@@ -1189,7 +1189,7 @@ void __cpuinit rtas_give_timebase(void)
local_irq_restore(flags);
}
-void __cpuinit rtas_take_timebase(void)
+void rtas_take_timebase(void)
{
while (!timebase)
barrier();
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index ee7ac5e..85398c7 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -480,7 +480,7 @@ static void cpu_idle_thread_init(unsigned int cpu, struct task_struct *idle)
secondary_ti = current_set[cpu] = ti;
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int rc, c;
@@ -610,7 +610,7 @@ static struct device_node *cpu_to_l2cache(int cpu)
}
/* Activate a secondary processor. */
-__cpuinit void start_secondary(void *unused)
+void start_secondary(void *unused)
{
unsigned int cpu = smp_processor_id();
struct device_node *l2_cache;
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index e68a845..27a90b9 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -341,7 +341,7 @@ static struct device_attribute pa6t_attrs[] = {
#endif /* HAS_PPC_PMC_PA6T */
#endif /* HAS_PPC_PMC_CLASSIC */
-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 device *s = &c->dev;
@@ -502,7 +502,7 @@ ssize_t arch_cpu_release(const char *buf, size_t count)
#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;
@@ -522,7 +522,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,
};
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 5fc29ad..65ab9e9 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -631,7 +631,6 @@ static int __init get_freq(char *name, int cells, unsigned long *val)
return found;
}
-/* should become __cpuinit when secondary_cpu_time_init also is */
void start_cpu_decrementer(void)
{
#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index d4f463a..1d9c926 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -711,7 +711,7 @@ static void __init vdso_setup_syscall_map(void)
}
#ifdef CONFIG_PPC64
-int __cpuinit vdso_getcpu_init(void)
+int vdso_getcpu_init(void)
{
unsigned long cpu, node, val;
diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index 2c9441e..82b1ff7 100644
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -41,7 +41,7 @@ int icache_44x_need_flush;
unsigned long tlb_47x_boltmap[1024/8];
-static void __cpuinit ppc44x_update_tlb_hwater(void)
+static void ppc44x_update_tlb_hwater(void)
{
extern unsigned int tlb_44x_patch_hwater_D[];
extern unsigned int tlb_44x_patch_hwater_I[];
@@ -134,7 +134,7 @@ static void __init ppc47x_update_boltmap(void)
/*
* "Pins" a 256MB TLB entry in AS0 for kernel lowmem for 47x type MMU
*/
-static void __cpuinit ppc47x_pin_tlb(unsigned int virt, unsigned int phys)
+static void ppc47x_pin_tlb(unsigned int virt, unsigned int phys)
{
unsigned int rA;
int bolted;
@@ -229,7 +229,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
}
#ifdef CONFIG_SMP
-void __cpuinit mmu_init_secondary(int cpu)
+void mmu_init_secondary(int cpu)
{
unsigned long addr;
unsigned long memstart = memstart_addr & ~(PPC_PIN_SIZE - 1);
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index e303a6d..4481172 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -807,7 +807,7 @@ void __init early_init_mmu(void)
}
#ifdef CONFIG_SMP
-void __cpuinit early_init_mmu_secondary(void)
+void early_init_mmu_secondary(void)
{
/* Initialize hash table for that CPU */
if (!firmware_has_feature(FW_FEATURE_LPAR))
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index 810f8e4..af3d78e 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -332,8 +332,8 @@ void destroy_context(struct mm_struct *mm)
#ifdef CONFIG_SMP
-static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int mmu_context_cpu_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
@@ -366,7 +366,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata mmu_context_cpu_nb = {
+static struct notifier_block mmu_context_cpu_nb = {
.notifier_call = mmu_context_cpu_notify,
};
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 88c0425..c792cd9 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -516,7 +516,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 = of_get_cpu_node(lcpu, NULL);
@@ -538,8 +538,7 @@ out:
return nid;
}
-static int __cpuinit cpu_numa_callback(struct notifier_block *nfb,
- unsigned long action,
+static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
void *hcpu)
{
unsigned long lcpu = (unsigned long)hcpu;
@@ -919,7 +918,7 @@ static void __init *careful_zallocation(int nid, unsigned long size,
return 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. */
};
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index 6888cad..41cd68d 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -648,7 +648,7 @@ void __init early_init_mmu(void)
__early_init_mmu(1);
}
-void __cpuinit early_init_mmu_secondary(void)
+void early_init_mmu_secondary(void)
{
__early_init_mmu(0);
}
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 29c6482..af94a71 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1786,7 +1786,7 @@ static void power_pmu_setup(int cpu)
cpuhw->mmcr[0] = MMCR0_FC;
}
-static int __cpuinit
+static int
power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
@@ -1803,7 +1803,7 @@ power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu
return NOTIFY_OK;
}
-int __cpuinit register_power_pmu(struct power_pmu *pmu)
+int register_power_pmu(struct power_pmu *pmu)
{
if (ppmu)
return -EBUSY; /* something's already registered */
diff --git a/arch/powerpc/platforms/44x/currituck.c b/arch/powerpc/platforms/44x/currituck.c
index c52e1b3..7f1b71a 100644
--- a/arch/powerpc/platforms/44x/currituck.c
+++ b/arch/powerpc/platforms/44x/currituck.c
@@ -91,12 +91,12 @@ static void __init ppc47x_init_irq(void)
}
#ifdef CONFIG_SMP
-static void __cpuinit smp_ppc47x_setup_cpu(int cpu)
+static void smp_ppc47x_setup_cpu(int cpu)
{
mpic_setup_this_cpu();
}
-static int __cpuinit smp_ppc47x_kick_cpu(int cpu)
+static int smp_ppc47x_kick_cpu(int cpu)
{
struct device_node *cpunode = of_get_cpu_node(cpu, NULL);
const u64 *spin_table_addr_prop;
diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index a28a862..4241bc8 100644
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -81,12 +81,12 @@ static void __init iss4xx_init_irq(void)
}
#ifdef CONFIG_SMP
-static void __cpuinit smp_iss4xx_setup_cpu(int cpu)
+static void smp_iss4xx_setup_cpu(int cpu)
{
mpic_setup_this_cpu();
}
-static int __cpuinit smp_iss4xx_kick_cpu(int cpu)
+static int smp_iss4xx_kick_cpu(int cpu)
{
struct device_node *cpunode = of_get_cpu_node(cpu, NULL);
const u64 *spin_table_addr_prop;
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 6a17599..5ced4f5 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -99,7 +99,7 @@ static void mpc85xx_take_timebase(void)
}
#ifdef CONFIG_HOTPLUG_CPU
-static void __cpuinit smp_85xx_mach_cpu_die(void)
+static void smp_85xx_mach_cpu_die(void)
{
unsigned int cpu = smp_processor_id();
u32 tmp;
@@ -141,7 +141,7 @@ static inline u32 read_spin_table_addr_l(void *spin_table)
return in_be32(&((struct epapr_spin_table *)spin_table)->addr_l);
}
-static int __cpuinit smp_85xx_kick_cpu(int nr)
+static int smp_85xx_kick_cpu(int nr)
{
unsigned long flags;
const u64 *cpu_rel_addr;
@@ -362,7 +362,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
}
#endif /* CONFIG_KEXEC */
-static void __cpuinit smp_85xx_setup_cpu(int cpu_nr)
+static void smp_85xx_setup_cpu(int cpu_nr)
{
if (smp_85xx_ops.probe == smp_mpic_probe)
mpic_setup_this_cpu();
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index f921067..5cbd4d6 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -885,7 +885,7 @@ static int smp_core99_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
+static struct notifier_block smp_core99_cpu_nb = {
.notifier_call = smp_core99_cpu_notify,
};
#endif /* CONFIG_HOTPLUG_CPU */
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index 77784ae..89e3857 100644
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -40,7 +40,7 @@
#define DBG(fmt...)
#endif
-static void __cpuinit pnv_smp_setup_cpu(int cpu)
+static void pnv_smp_setup_cpu(int cpu)
{
if (cpu != boot_cpuid)
xics_setup_cpu();
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 04/32] powerpc: delete __cpuinit usage from all users
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Benjamin Herrenschmidt, Paul Mackerras,
Josh Boyer, Matt Porter, Kumar Gala, linuxppc-dev
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the powerpc uses of the __cpuinit macros. There
are no __CPUINIT users in assembly files in powerpc.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/powerpc/include/asm/rtas.h | 4 ++--
arch/powerpc/include/asm/vdso.h | 2 +-
arch/powerpc/kernel/cacheinfo.c | 36 ++++++++++++++++++++--------------
arch/powerpc/kernel/rtas.c | 4 ++--
arch/powerpc/kernel/smp.c | 4 ++--
arch/powerpc/kernel/sysfs.c | 6 +++---
arch/powerpc/kernel/time.c | 1 -
arch/powerpc/kernel/vdso.c | 2 +-
arch/powerpc/mm/44x_mmu.c | 6 +++---
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/mmu_context_nohash.c | 6 +++---
arch/powerpc/mm/numa.c | 7 +++----
arch/powerpc/mm/tlb_nohash.c | 2 +-
arch/powerpc/perf/core-book3s.c | 4 ++--
arch/powerpc/platforms/44x/currituck.c | 4 ++--
arch/powerpc/platforms/44x/iss4xx.c | 4 ++--
arch/powerpc/platforms/85xx/smp.c | 6 +++---
arch/powerpc/platforms/powermac/smp.c | 2 +-
arch/powerpc/platforms/powernv/smp.c | 2 +-
19 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 34fd704..c7a8bfc 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -350,8 +350,8 @@ static inline u32 rtas_config_addr(int busno, int devfn, int reg)
(devfn << 8) | (reg & 0xff);
}
-extern void __cpuinit rtas_give_timebase(void);
-extern void __cpuinit rtas_take_timebase(void);
+extern void rtas_give_timebase(void);
+extern void rtas_take_timebase(void);
#ifdef CONFIG_PPC_RTAS
static inline int page_is_rtas_user_buf(unsigned long pfn)
diff --git a/arch/powerpc/include/asm/vdso.h b/arch/powerpc/include/asm/vdso.h
index 50f261b..0d9cecd 100644
--- a/arch/powerpc/include/asm/vdso.h
+++ b/arch/powerpc/include/asm/vdso.h
@@ -22,7 +22,7 @@ extern unsigned long vdso64_rt_sigtramp;
extern unsigned long vdso32_sigtramp;
extern unsigned long vdso32_rt_sigtramp;
-int __cpuinit vdso_getcpu_init(void);
+int vdso_getcpu_init(void);
#else /* __ASSEMBLY__ */
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index 92c6b00..9262cf2 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -131,7 +131,8 @@ static const char *cache_type_string(const struct cache *cache)
return cache_type_info[cache->type].name;
}
-static void __cpuinit cache_init(struct cache *cache, int type, int level, struct device_node *ofnode)
+static void cache_init(struct cache *cache, int type, int level,
+ struct device_node *ofnode)
{
cache->type = type;
cache->level = level;
@@ -140,7 +141,7 @@ static void __cpuinit cache_init(struct cache *cache, int type, int level, struc
list_add(&cache->list, &cache_list);
}
-static struct cache *__cpuinit new_cache(int type, int level, struct device_node *ofnode)
+static struct cache *new_cache(int type, int level, struct device_node *ofnode)
{
struct cache *cache;
@@ -324,7 +325,8 @@ static bool cache_node_is_unified(const struct device_node *np)
return of_get_property(np, "cache-unified", NULL);
}
-static struct cache *__cpuinit cache_do_one_devnode_unified(struct device_node *node, int level)
+static struct cache *cache_do_one_devnode_unified(struct device_node *node,
+ int level)
{
struct cache *cache;
@@ -335,7 +337,8 @@ static struct cache *__cpuinit cache_do_one_devnode_unified(struct device_node *
return cache;
}
-static struct cache *__cpuinit cache_do_one_devnode_split(struct device_node *node, int level)
+static struct cache *cache_do_one_devnode_split(struct device_node *node,
+ int level)
{
struct cache *dcache, *icache;
@@ -357,7 +360,7 @@ err:
return NULL;
}
-static struct cache *__cpuinit cache_do_one_devnode(struct device_node *node, int level)
+static struct cache *cache_do_one_devnode(struct device_node *node, int level)
{
struct cache *cache;
@@ -369,7 +372,8 @@ static struct cache *__cpuinit cache_do_one_devnode(struct device_node *node, in
return cache;
}
-static struct cache *__cpuinit cache_lookup_or_instantiate(struct device_node *node, int level)
+static struct cache *cache_lookup_or_instantiate(struct device_node *node,
+ int level)
{
struct cache *cache;
@@ -385,7 +389,7 @@ static struct cache *__cpuinit cache_lookup_or_instantiate(struct device_node *n
return cache;
}
-static void __cpuinit link_cache_lists(struct cache *smaller, struct cache *bigger)
+static void link_cache_lists(struct cache *smaller, struct cache *bigger)
{
while (smaller->next_local) {
if (smaller->next_local == bigger)
@@ -396,13 +400,13 @@ static void __cpuinit link_cache_lists(struct cache *smaller, struct cache *bigg
smaller->next_local = bigger;
}
-static void __cpuinit do_subsidiary_caches_debugcheck(struct cache *cache)
+static void do_subsidiary_caches_debugcheck(struct cache *cache)
{
WARN_ON_ONCE(cache->level != 1);
WARN_ON_ONCE(strcmp(cache->ofnode->type, "cpu"));
}
-static void __cpuinit do_subsidiary_caches(struct cache *cache)
+static void do_subsidiary_caches(struct cache *cache)
{
struct device_node *subcache_node;
int level = cache->level;
@@ -423,7 +427,7 @@ static void __cpuinit do_subsidiary_caches(struct cache *cache)
}
}
-static struct cache *__cpuinit cache_chain_instantiate(unsigned int cpu_id)
+static struct cache *cache_chain_instantiate(unsigned int cpu_id)
{
struct device_node *cpu_node;
struct cache *cpu_cache = NULL;
@@ -448,7 +452,7 @@ out:
return cpu_cache;
}
-static struct cache_dir *__cpuinit cacheinfo_create_cache_dir(unsigned int cpu_id)
+static struct cache_dir *cacheinfo_create_cache_dir(unsigned int cpu_id)
{
struct cache_dir *cache_dir;
struct device *dev;
@@ -653,7 +657,7 @@ static struct kobj_type cache_index_type = {
.default_attrs = cache_index_default_attrs,
};
-static void __cpuinit cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)
+static void cacheinfo_create_index_opt_attrs(struct cache_index_dir *dir)
{
const char *cache_name;
const char *cache_type;
@@ -696,7 +700,8 @@ static void __cpuinit cacheinfo_create_index_opt_attrs(struct cache_index_dir *d
kfree(buf);
}
-static void __cpuinit cacheinfo_create_index_dir(struct cache *cache, int index, struct cache_dir *cache_dir)
+static void cacheinfo_create_index_dir(struct cache *cache, int index,
+ struct cache_dir *cache_dir)
{
struct cache_index_dir *index_dir;
int rc;
@@ -722,7 +727,8 @@ err:
kfree(index_dir);
}
-static void __cpuinit cacheinfo_sysfs_populate(unsigned int cpu_id, struct cache *cache_list)
+static void cacheinfo_sysfs_populate(unsigned int cpu_id,
+ struct cache *cache_list)
{
struct cache_dir *cache_dir;
struct cache *cache;
@@ -740,7 +746,7 @@ static void __cpuinit cacheinfo_sysfs_populate(unsigned int cpu_id, struct cache
}
}
-void __cpuinit cacheinfo_cpu_online(unsigned int cpu_id)
+void cacheinfo_cpu_online(unsigned int cpu_id)
{
struct cache *cache;
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 52add6f..80b5ef4 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -1172,7 +1172,7 @@ int __init early_init_dt_scan_rtas(unsigned long node,
static arch_spinlock_t timebase_lock;
static u64 timebase = 0;
-void __cpuinit rtas_give_timebase(void)
+void rtas_give_timebase(void)
{
unsigned long flags;
@@ -1189,7 +1189,7 @@ void __cpuinit rtas_give_timebase(void)
local_irq_restore(flags);
}
-void __cpuinit rtas_take_timebase(void)
+void rtas_take_timebase(void)
{
while (!timebase)
barrier();
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index ee7ac5e..85398c7 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -480,7 +480,7 @@ static void cpu_idle_thread_init(unsigned int cpu, struct task_struct *idle)
secondary_ti = current_set[cpu] = ti;
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int rc, c;
@@ -610,7 +610,7 @@ static struct device_node *cpu_to_l2cache(int cpu)
}
/* Activate a secondary processor. */
-__cpuinit void start_secondary(void *unused)
+void start_secondary(void *unused)
{
unsigned int cpu = smp_processor_id();
struct device_node *l2_cache;
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index e68a845..27a90b9 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -341,7 +341,7 @@ static struct device_attribute pa6t_attrs[] = {
#endif /* HAS_PPC_PMC_PA6T */
#endif /* HAS_PPC_PMC_CLASSIC */
-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 device *s = &c->dev;
@@ -502,7 +502,7 @@ ssize_t arch_cpu_release(const char *buf, size_t count)
#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;
@@ -522,7 +522,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,
};
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 5fc29ad..65ab9e9 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -631,7 +631,6 @@ static int __init get_freq(char *name, int cells, unsigned long *val)
return found;
}
-/* should become __cpuinit when secondary_cpu_time_init also is */
void start_cpu_decrementer(void)
{
#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index d4f463a..1d9c926 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -711,7 +711,7 @@ static void __init vdso_setup_syscall_map(void)
}
#ifdef CONFIG_PPC64
-int __cpuinit vdso_getcpu_init(void)
+int vdso_getcpu_init(void)
{
unsigned long cpu, node, val;
diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index 2c9441e..82b1ff7 100644
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -41,7 +41,7 @@ int icache_44x_need_flush;
unsigned long tlb_47x_boltmap[1024/8];
-static void __cpuinit ppc44x_update_tlb_hwater(void)
+static void ppc44x_update_tlb_hwater(void)
{
extern unsigned int tlb_44x_patch_hwater_D[];
extern unsigned int tlb_44x_patch_hwater_I[];
@@ -134,7 +134,7 @@ static void __init ppc47x_update_boltmap(void)
/*
* "Pins" a 256MB TLB entry in AS0 for kernel lowmem for 47x type MMU
*/
-static void __cpuinit ppc47x_pin_tlb(unsigned int virt, unsigned int phys)
+static void ppc47x_pin_tlb(unsigned int virt, unsigned int phys)
{
unsigned int rA;
int bolted;
@@ -229,7 +229,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base,
}
#ifdef CONFIG_SMP
-void __cpuinit mmu_init_secondary(int cpu)
+void mmu_init_secondary(int cpu)
{
unsigned long addr;
unsigned long memstart = memstart_addr & ~(PPC_PIN_SIZE - 1);
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index e303a6d..4481172 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -807,7 +807,7 @@ void __init early_init_mmu(void)
}
#ifdef CONFIG_SMP
-void __cpuinit early_init_mmu_secondary(void)
+void early_init_mmu_secondary(void)
{
/* Initialize hash table for that CPU */
if (!firmware_has_feature(FW_FEATURE_LPAR))
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index 810f8e4..af3d78e 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -332,8 +332,8 @@ void destroy_context(struct mm_struct *mm)
#ifdef CONFIG_SMP
-static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int mmu_context_cpu_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
@@ -366,7 +366,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata mmu_context_cpu_nb = {
+static struct notifier_block mmu_context_cpu_nb = {
.notifier_call = mmu_context_cpu_notify,
};
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 88c0425..c792cd9 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -516,7 +516,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 = of_get_cpu_node(lcpu, NULL);
@@ -538,8 +538,7 @@ out:
return nid;
}
-static int __cpuinit cpu_numa_callback(struct notifier_block *nfb,
- unsigned long action,
+static int cpu_numa_callback(struct notifier_block *nfb, unsigned long action,
void *hcpu)
{
unsigned long lcpu = (unsigned long)hcpu;
@@ -919,7 +918,7 @@ static void __init *careful_zallocation(int nid, unsigned long size,
return 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. */
};
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index 6888cad..41cd68d 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -648,7 +648,7 @@ void __init early_init_mmu(void)
__early_init_mmu(1);
}
-void __cpuinit early_init_mmu_secondary(void)
+void early_init_mmu_secondary(void)
{
__early_init_mmu(0);
}
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 29c6482..af94a71 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1786,7 +1786,7 @@ static void power_pmu_setup(int cpu)
cpuhw->mmcr[0] = MMCR0_FC;
}
-static int __cpuinit
+static int
power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
@@ -1803,7 +1803,7 @@ power_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu
return NOTIFY_OK;
}
-int __cpuinit register_power_pmu(struct power_pmu *pmu)
+int register_power_pmu(struct power_pmu *pmu)
{
if (ppmu)
return -EBUSY; /* something's already registered */
diff --git a/arch/powerpc/platforms/44x/currituck.c b/arch/powerpc/platforms/44x/currituck.c
index c52e1b3..7f1b71a 100644
--- a/arch/powerpc/platforms/44x/currituck.c
+++ b/arch/powerpc/platforms/44x/currituck.c
@@ -91,12 +91,12 @@ static void __init ppc47x_init_irq(void)
}
#ifdef CONFIG_SMP
-static void __cpuinit smp_ppc47x_setup_cpu(int cpu)
+static void smp_ppc47x_setup_cpu(int cpu)
{
mpic_setup_this_cpu();
}
-static int __cpuinit smp_ppc47x_kick_cpu(int cpu)
+static int smp_ppc47x_kick_cpu(int cpu)
{
struct device_node *cpunode = of_get_cpu_node(cpu, NULL);
const u64 *spin_table_addr_prop;
diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index a28a862..4241bc8 100644
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -81,12 +81,12 @@ static void __init iss4xx_init_irq(void)
}
#ifdef CONFIG_SMP
-static void __cpuinit smp_iss4xx_setup_cpu(int cpu)
+static void smp_iss4xx_setup_cpu(int cpu)
{
mpic_setup_this_cpu();
}
-static int __cpuinit smp_iss4xx_kick_cpu(int cpu)
+static int smp_iss4xx_kick_cpu(int cpu)
{
struct device_node *cpunode = of_get_cpu_node(cpu, NULL);
const u64 *spin_table_addr_prop;
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 6a17599..5ced4f5 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -99,7 +99,7 @@ static void mpc85xx_take_timebase(void)
}
#ifdef CONFIG_HOTPLUG_CPU
-static void __cpuinit smp_85xx_mach_cpu_die(void)
+static void smp_85xx_mach_cpu_die(void)
{
unsigned int cpu = smp_processor_id();
u32 tmp;
@@ -141,7 +141,7 @@ static inline u32 read_spin_table_addr_l(void *spin_table)
return in_be32(&((struct epapr_spin_table *)spin_table)->addr_l);
}
-static int __cpuinit smp_85xx_kick_cpu(int nr)
+static int smp_85xx_kick_cpu(int nr)
{
unsigned long flags;
const u64 *cpu_rel_addr;
@@ -362,7 +362,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
}
#endif /* CONFIG_KEXEC */
-static void __cpuinit smp_85xx_setup_cpu(int cpu_nr)
+static void smp_85xx_setup_cpu(int cpu_nr)
{
if (smp_85xx_ops.probe == smp_mpic_probe)
mpic_setup_this_cpu();
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index f921067..5cbd4d6 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -885,7 +885,7 @@ static int smp_core99_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
+static struct notifier_block smp_core99_cpu_nb = {
.notifier_call = smp_core99_cpu_notify,
};
#endif /* CONFIG_HOTPLUG_CPU */
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index 77784ae..89e3857 100644
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -40,7 +40,7 @@
#define DBG(fmt...)
#endif
-static void __cpuinit pnv_smp_setup_cpu(int cpu)
+static void pnv_smp_setup_cpu(int cpu)
{
if (cpu != boot_cpuid)
xics_setup_cpu();
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 05/32] parisc: delete __cpuinit usage from all users
2013-06-24 19:30 ` Paul Gortmaker
` (7 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Helge Deller, linux-parisc
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the parisc uses of the __cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/parisc/kernel/firmware.c | 14 ++++++++------
arch/parisc/kernel/hardware.c | 2 +-
arch/parisc/kernel/processor.c | 6 +++---
arch/parisc/kernel/smp.c | 8 ++++----
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index f65fa48..2239590 100644
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -150,7 +150,7 @@ static void convert_to_wide(unsigned long *addr)
}
#ifdef CONFIG_64BIT
-void __cpuinit set_firmware_width_unlocked(void)
+void set_firmware_width_unlocked(void)
{
int ret;
@@ -167,7 +167,7 @@ void __cpuinit set_firmware_width_unlocked(void)
* This function must be called before any pdc_* function that uses the
* convert_to_wide function.
*/
-void __cpuinit set_firmware_width(void)
+void set_firmware_width(void)
{
unsigned long flags;
spin_lock_irqsave(&pdc_lock, flags);
@@ -175,11 +175,13 @@ void __cpuinit set_firmware_width(void)
spin_unlock_irqrestore(&pdc_lock, flags);
}
#else
-void __cpuinit set_firmware_width_unlocked(void) {
+void set_firmware_width_unlocked(void)
+{
return;
}
-void __cpuinit set_firmware_width(void) {
+void set_firmware_width(void)
+{
return;
}
#endif /*CONFIG_64BIT*/
@@ -301,7 +303,7 @@ int pdc_chassis_warn(unsigned long *warn)
return retval;
}
-int __cpuinit pdc_coproc_cfg_unlocked(struct pdc_coproc_cfg *pdc_coproc_info)
+int pdc_coproc_cfg_unlocked(struct pdc_coproc_cfg *pdc_coproc_info)
{
int ret;
@@ -322,7 +324,7 @@ int __cpuinit pdc_coproc_cfg_unlocked(struct pdc_coproc_cfg *pdc_coproc_info)
* This PDC call returns the presence and status of all the coprocessors
* attached to the processor.
*/
-int __cpuinit pdc_coproc_cfg(struct pdc_coproc_cfg *pdc_coproc_info)
+int pdc_coproc_cfg(struct pdc_coproc_cfg *pdc_coproc_info)
{
int ret;
unsigned long flags;
diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 8722756..06cb399 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -1367,7 +1367,7 @@ const char *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;
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index c8fb61e..a128a94 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -73,7 +73,7 @@ extern int update_cr16_clocksource(void); /* from time.c */
*
* FIXME: doesn't do much yet...
*/
-static void __cpuinit
+static void
init_percpu_prof(unsigned long cpunum)
{
struct cpuinfo_parisc *p;
@@ -92,7 +92,7 @@ init_percpu_prof(unsigned long cpunum)
* (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;
@@ -299,7 +299,7 @@ void __init collect_boot_cpu_data(void)
*
* o Enable CPU profiling hooks.
*/
-int __cpuinit init_per_cpu(int cpunum)
+int init_per_cpu(int cpunum)
{
int ret;
struct pdc_coproc_cfg coproc_cfg;
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index e3614fb..8a252f2 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -62,9 +62,9 @@ static int smp_debug_lvl = 0;
volatile struct task_struct *smp_init_current_idle_task;
/* track which CPU is booting */
-static volatile int cpu_now_booting __cpuinitdata;
+static volatile int cpu_now_booting;
-static int parisc_max_cpus __cpuinitdata = 1;
+static int parisc_max_cpus = 1;
static DEFINE_PER_CPU(spinlock_t, ipi_lock);
@@ -328,7 +328,7 @@ void __init smp_callin(void)
/*
* Bring one cpu online.
*/
-int __cpuinit smp_boot_one_cpu(int cpuid, struct task_struct *idle)
+int smp_boot_one_cpu(int cpuid, struct task_struct *idle)
{
const struct cpuinfo_parisc *p = &per_cpu(cpu_data, cpuid);
long timeout;
@@ -424,7 +424,7 @@ void smp_cpus_done(unsigned int cpu_max)
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
if (cpu != 0 && cpu < parisc_max_cpus)
smp_boot_one_cpu(cpu, tidle);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 06/32] ia64: delete __cpuinit usage from all ia64 users
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Tony Luck, Fenghua Yu, linux-ia64
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the ia64 uses of the __cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/ia64/kernel/acpi.c | 4 ++--
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 | 8 ++++----
arch/ia64/kernel/topology.c | 18 +++++++++---------
arch/ia64/mm/contig.c | 3 +--
arch/ia64/mm/discontig.c | 2 +-
arch/ia64/mm/numa.c | 2 +-
arch/ia64/sn/kernel/setup.c | 8 ++++----
arch/ia64/xen/hypervisor.c | 2 +-
14 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 335eb07..5eb71d2 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -807,7 +807,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
* ACPI based hotplug CPU support
*/
#ifdef CONFIG_ACPI_HOTPLUG_CPU
-static __cpuinit
+static
int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
{
#ifdef CONFIG_ACPI_NUMA
@@ -882,7 +882,7 @@ __init void prefill_possible_map(void)
set_cpu_possible(i, true);
}
-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;
diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index 2d67317..f59c0b8 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -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 device * sys_dev)
+static int err_inject_add_dev(struct device *sys_dev)
{
return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);
}
-static int __cpuinit err_inject_remove_dev(struct device * sys_dev)
+static int err_inject_remove_dev(struct 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,
};
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index d7396db..b8edfa7 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -631,7 +631,7 @@ ia64_mca_register_cpev (int cpev)
* Outputs
* None
*/
-void __cpuinit
+void
ia64_mca_cmc_vector_setup (void)
{
cmcv_reg_t cmcv;
@@ -1814,7 +1814,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)
{
@@ -1844,7 +1844,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;
@@ -1896,7 +1896,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;
@@ -1906,7 +1906,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)
{
@@ -1922,7 +1922,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
};
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index c93420c..d288cde 100644
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -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);
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 2b3c2d7..ab33328 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -932,7 +932,7 @@ static const struct file_operations proc_palinfo_fops = {
.release = single_release,
};
-static void __cpuinit
+static void
create_palinfo_proc_entries(unsigned int cpu)
{
pal_func_cpu_u_t f;
@@ -962,7 +962,7 @@ remove_palinfo_proc_entries(unsigned int hcpu)
remove_proc_subtree(cpustr, palinfo_dir);
}
-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;
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 4bc580a..960a396 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -568,7 +568,7 @@ static const struct file_operations salinfo_data_fops = {
.llseek = default_llseek,
};
-static int __cpuinit
+static int
salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
{
unsigned int i, cpu = (unsigned long)hcpu;
@@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
return NOTIFY_OK;
}
-static struct notifier_block salinfo_cpu_notifier __cpuinitdata +static struct notifier_block salinfo_cpu_notifier {
.notifier_call = salinfo_cpu_callback,
.priority = 0,
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 13bfdd2..4fc2e95 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -748,7 +748,7 @@ const struct seq_operations cpuinfo_op = {
#define MAX_BRANDS 8
static char brandname[MAX_BRANDS][128];
-static char * __cpuinit
+static char *
get_model_name(__u8 family, __u8 model)
{
static int overflow;
@@ -778,7 +778,7 @@ get_model_name(__u8 family, __u8 model)
return "Unknown";
}
-static void __cpuinit
+static void
identify_cpu (struct cpuinfo_ia64 *c)
{
union {
@@ -850,7 +850,7 @@ identify_cpu (struct cpuinfo_ia64 *c)
* 2. the minimum of the i-cache stride sizes for "flush_icache_range()".
* 3. the minimum of the cache stride sizes for "clflush_cache_range()".
*/
-static void __cpuinit
+static void
get_cache_info(void)
{
unsigned long line_size, max = 1;
@@ -915,10 +915,10 @@ get_cache_info(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;
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 8d87168..547a48d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -351,7 +351,7 @@ static inline void smp_setup_percpu_timer(void)
{
}
-static void __cpuinit
+static void
smp_callin (void)
{
int cpuid, phys_id, itc_master;
@@ -442,7 +442,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 */
@@ -459,7 +459,7 @@ start_secondary (void *unused)
return 0;
}
-static int __cpuinit
+static int
do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)
{
int timeout;
@@ -728,7 +728,7 @@ static inline void set_cpu_sibling_map(int cpu)
}
}
-int __cpuinit
+int
__cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int ret;
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index dc00b2c..ca69a5a 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -135,11 +135,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;
@@ -174,7 +174,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);
@@ -298,7 +298,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;
@@ -307,7 +307,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)
{
unsigned long i, levels, unique_caches;
pal_cache_config_info_t cci;
@@ -351,7 +351,7 @@ static int __cpuinit cpu_cache_sysfs_init(unsigned int cpu)
}
/* Add cache interface for CPU device */
-static int __cpuinit cache_add_dev(struct device * sys_dev)
+static int cache_add_dev(struct device *sys_dev)
{
unsigned int cpu = sys_dev->id;
unsigned long i, j;
@@ -401,7 +401,7 @@ static int __cpuinit cache_add_dev(struct device * sys_dev)
}
/* Remove cache interface for CPU device */
-static int __cpuinit cache_remove_dev(struct device * sys_dev)
+static int cache_remove_dev(struct device *sys_dev)
{
unsigned int cpu = sys_dev->id;
unsigned long i;
@@ -425,7 +425,7 @@ static int __cpuinit cache_remove_dev(struct 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;
@@ -445,7 +445,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
};
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index e4a6a536..da5237d 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -156,8 +156,7 @@ static void *cpu_data;
*
* Allocate and setup per-cpu data areas.
*/
-void * __cpuinit
-per_cpu_init (void)
+void *per_cpu_init(void)
{
static bool first_time = true;
void *cpu0_data = __cpu0_per_cpu;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 58550b8..2de08f4 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -592,7 +592,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;
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 4248492..ea21d4c 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -86,7 +86,7 @@ int __meminit __early_pfn_to_nid(unsigned long pfn)
return -1;
}
-void __cpuinit numa_clear_node(int cpu)
+void numa_clear_node(int cpu)
{
unmap_cpu_from_node(cpu, NUMA_NO_NODE);
}
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index f82e7b4..53b01b8 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -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
@@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found;
* Set flag for enabling shub specific wars
*/
-static inline int __cpuinit is_shub_1_1(int nasid)
+static inline int is_shub_1_1(int nasid)
{
unsigned long id;
int rev;
@@ -212,7 +212,7 @@ static inline int __cpuinit is_shub_1_1(int nasid)
return rev <= 2;
}
-static void __cpuinit sn_check_for_wars(void)
+static void sn_check_for_wars(void)
{
int cnode;
@@ -558,7 +558,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;
diff --git a/arch/ia64/xen/hypervisor.c b/arch/ia64/xen/hypervisor.c
index 52172ee..fab6252 100644
--- a/arch/ia64/xen/hypervisor.c
+++ b/arch/ia64/xen/hypervisor.c
@@ -74,7 +74,7 @@ void __init xen_setup_vcpu_info_placement(void)
xen_vcpu_setup(cpu);
}
-void __cpuinit
+void
xen_cpu_init(void)
{
xen_smp_intr_init();
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 06/32] ia64: delete __cpuinit usage from all ia64 users
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Tony Luck, Fenghua Yu, linux-ia64
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the ia64 uses of the __cpuinit macros.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/ia64/kernel/acpi.c | 4 ++--
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 | 8 ++++----
arch/ia64/kernel/topology.c | 18 +++++++++---------
arch/ia64/mm/contig.c | 3 +--
arch/ia64/mm/discontig.c | 2 +-
arch/ia64/mm/numa.c | 2 +-
arch/ia64/sn/kernel/setup.c | 8 ++++----
arch/ia64/xen/hypervisor.c | 2 +-
14 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 335eb07..5eb71d2 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -807,7 +807,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
* ACPI based hotplug CPU support
*/
#ifdef CONFIG_ACPI_HOTPLUG_CPU
-static __cpuinit
+static
int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
{
#ifdef CONFIG_ACPI_NUMA
@@ -882,7 +882,7 @@ __init void prefill_possible_map(void)
set_cpu_possible(i, true);
}
-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;
diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index 2d67317..f59c0b8 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -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 device * sys_dev)
+static int err_inject_add_dev(struct device *sys_dev)
{
return sysfs_create_group(&sys_dev->kobj, &err_inject_attr_group);
}
-static int __cpuinit err_inject_remove_dev(struct device * sys_dev)
+static int err_inject_remove_dev(struct 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,
};
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index d7396db..b8edfa7 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -631,7 +631,7 @@ ia64_mca_register_cpev (int cpev)
* Outputs
* None
*/
-void __cpuinit
+void
ia64_mca_cmc_vector_setup (void)
{
cmcv_reg_t cmcv;
@@ -1814,7 +1814,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)
{
@@ -1844,7 +1844,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;
@@ -1896,7 +1896,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;
@@ -1906,7 +1906,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)
{
@@ -1922,7 +1922,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
};
diff --git a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
index c93420c..d288cde 100644
--- a/arch/ia64/kernel/numa.c
+++ b/arch/ia64/kernel/numa.c
@@ -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);
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 2b3c2d7..ab33328 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -932,7 +932,7 @@ static const struct file_operations proc_palinfo_fops = {
.release = single_release,
};
-static void __cpuinit
+static void
create_palinfo_proc_entries(unsigned int cpu)
{
pal_func_cpu_u_t f;
@@ -962,7 +962,7 @@ remove_palinfo_proc_entries(unsigned int hcpu)
remove_proc_subtree(cpustr, palinfo_dir);
}
-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;
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 4bc580a..960a396 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -568,7 +568,7 @@ static const struct file_operations salinfo_data_fops = {
.llseek = default_llseek,
};
-static int __cpuinit
+static int
salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
{
unsigned int i, cpu = (unsigned long)hcpu;
@@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
return NOTIFY_OK;
}
-static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
+static struct notifier_block salinfo_cpu_notifier =
{
.notifier_call = salinfo_cpu_callback,
.priority = 0,
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 13bfdd2..4fc2e95 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -748,7 +748,7 @@ const struct seq_operations cpuinfo_op = {
#define MAX_BRANDS 8
static char brandname[MAX_BRANDS][128];
-static char * __cpuinit
+static char *
get_model_name(__u8 family, __u8 model)
{
static int overflow;
@@ -778,7 +778,7 @@ get_model_name(__u8 family, __u8 model)
return "Unknown";
}
-static void __cpuinit
+static void
identify_cpu (struct cpuinfo_ia64 *c)
{
union {
@@ -850,7 +850,7 @@ identify_cpu (struct cpuinfo_ia64 *c)
* 2. the minimum of the i-cache stride sizes for "flush_icache_range()".
* 3. the minimum of the cache stride sizes for "clflush_cache_range()".
*/
-static void __cpuinit
+static void
get_cache_info(void)
{
unsigned long line_size, max = 1;
@@ -915,10 +915,10 @@ get_cache_info(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;
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 8d87168..547a48d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -351,7 +351,7 @@ static inline void smp_setup_percpu_timer(void)
{
}
-static void __cpuinit
+static void
smp_callin (void)
{
int cpuid, phys_id, itc_master;
@@ -442,7 +442,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 */
@@ -459,7 +459,7 @@ start_secondary (void *unused)
return 0;
}
-static int __cpuinit
+static int
do_boot_cpu (int sapicid, int cpu, struct task_struct *idle)
{
int timeout;
@@ -728,7 +728,7 @@ static inline void set_cpu_sibling_map(int cpu)
}
}
-int __cpuinit
+int
__cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int ret;
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index dc00b2c..ca69a5a 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -135,11 +135,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;
@@ -174,7 +174,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);
@@ -298,7 +298,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;
@@ -307,7 +307,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)
{
unsigned long i, levels, unique_caches;
pal_cache_config_info_t cci;
@@ -351,7 +351,7 @@ static int __cpuinit cpu_cache_sysfs_init(unsigned int cpu)
}
/* Add cache interface for CPU device */
-static int __cpuinit cache_add_dev(struct device * sys_dev)
+static int cache_add_dev(struct device *sys_dev)
{
unsigned int cpu = sys_dev->id;
unsigned long i, j;
@@ -401,7 +401,7 @@ static int __cpuinit cache_add_dev(struct device * sys_dev)
}
/* Remove cache interface for CPU device */
-static int __cpuinit cache_remove_dev(struct device * sys_dev)
+static int cache_remove_dev(struct device *sys_dev)
{
unsigned int cpu = sys_dev->id;
unsigned long i;
@@ -425,7 +425,7 @@ static int __cpuinit cache_remove_dev(struct 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;
@@ -445,7 +445,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
};
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index e4a6a536..da5237d 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -156,8 +156,7 @@ static void *cpu_data;
*
* Allocate and setup per-cpu data areas.
*/
-void * __cpuinit
-per_cpu_init (void)
+void *per_cpu_init(void)
{
static bool first_time = true;
void *cpu0_data = __cpu0_per_cpu;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 58550b8..2de08f4 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -592,7 +592,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;
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 4248492..ea21d4c 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -86,7 +86,7 @@ int __meminit __early_pfn_to_nid(unsigned long pfn)
return -1;
}
-void __cpuinit numa_clear_node(int cpu)
+void numa_clear_node(int cpu)
{
unmap_cpu_from_node(cpu, NUMA_NO_NODE);
}
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index f82e7b4..53b01b8 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -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
@@ -200,7 +200,7 @@ static int __cpuinitdata shub_1_1_found;
* Set flag for enabling shub specific wars
*/
-static inline int __cpuinit is_shub_1_1(int nasid)
+static inline int is_shub_1_1(int nasid)
{
unsigned long id;
int rev;
@@ -212,7 +212,7 @@ static inline int __cpuinit is_shub_1_1(int nasid)
return rev <= 2;
}
-static void __cpuinit sn_check_for_wars(void)
+static void sn_check_for_wars(void)
{
int cnode;
@@ -558,7 +558,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;
diff --git a/arch/ia64/xen/hypervisor.c b/arch/ia64/xen/hypervisor.c
index 52172ee..fab6252 100644
--- a/arch/ia64/xen/hypervisor.c
+++ b/arch/ia64/xen/hypervisor.c
@@ -74,7 +74,7 @@ void __init xen_setup_vcpu_info_placement(void)
xen_vcpu_setup(cpu);
}
-void __cpuinit
+void
xen_cpu_init(void)
{
xen_smp_intr_init();
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-arm-kernel
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
This removes all the ARM uses of the __cpuinit macros from C code,
and all __CPUINIT from assembly code. It also had two ".previous"
section statements that were paired off against __CPUINIT
(aka .section ".cpuinit.text") that also get removed here.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/arm/common/mcpm_platsmp.c | 4 ++--
arch/arm/include/asm/arch_timer.h | 2 +-
arch/arm/kernel/head-common.S | 1 -
arch/arm/kernel/head.S | 1 -
arch/arm/kernel/hw_breakpoint.c | 4 ++--
arch/arm/kernel/perf_event_cpu.c | 6 +++---
arch/arm/kernel/psci_smp.c | 3 +--
arch/arm/kernel/smp.c | 18 +++++++++---------
arch/arm/kernel/smp_twd.c | 6 +++---
arch/arm/lib/delay.c | 2 +-
arch/arm/mach-exynos/headsmp.S | 2 --
arch/arm/mach-exynos/platsmp.c | 4 ++--
arch/arm/mach-highbank/platsmp.c | 2 +-
arch/arm/mach-imx/platsmp.c | 2 +-
arch/arm/mach-msm/headsmp.S | 2 --
arch/arm/mach-msm/platsmp.c | 6 +++---
arch/arm/mach-msm/timer.c | 4 ++--
arch/arm/mach-mvebu/coherency.c | 2 +-
arch/arm/mach-mvebu/headsmp.S | 2 --
arch/arm/mach-mvebu/platsmp.c | 5 ++---
arch/arm/mach-omap2/omap-headsmp.S | 2 --
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 4 ++--
arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++--
arch/arm/mach-prima2/headsmp.S | 2 --
arch/arm/mach-prima2/platsmp.c | 4 ++--
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 2 --
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-socfpga/platsmp.c | 2 +-
arch/arm/mach-spear/generic.h | 2 +-
arch/arm/mach-spear/platsmp.c | 4 ++--
arch/arm/mach-tegra/platsmp.c | 4 ++--
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 4 ++--
arch/arm/mach-zynq/common.h | 2 +-
arch/arm/mach-zynq/headsmp.S | 2 --
arch/arm/mach-zynq/platsmp.c | 6 +++---
arch/arm/mm/proc-arm1020.S | 2 --
arch/arm/mm/proc-arm1020e.S | 2 --
arch/arm/mm/proc-arm1022.S | 2 --
arch/arm/mm/proc-arm1026.S | 3 ---
arch/arm/mm/proc-arm720.S | 2 --
arch/arm/mm/proc-arm740.S | 2 --
arch/arm/mm/proc-arm7tdmi.S | 2 --
arch/arm/mm/proc-arm920.S | 2 --
arch/arm/mm/proc-arm922.S | 2 --
arch/arm/mm/proc-arm925.S | 2 --
arch/arm/mm/proc-arm926.S | 2 --
arch/arm/mm/proc-arm940.S | 2 --
arch/arm/mm/proc-arm946.S | 2 --
arch/arm/mm/proc-arm9tdmi.S | 2 --
arch/arm/mm/proc-fa526.S | 2 --
arch/arm/mm/proc-feroceon.S | 2 --
arch/arm/mm/proc-mohawk.S | 2 --
arch/arm/mm/proc-sa110.S | 2 --
arch/arm/mm/proc-sa1100.S | 2 --
arch/arm/mm/proc-v6.S | 2 --
arch/arm/mm/proc-v7-2level.S | 4 ----
arch/arm/mm/proc-v7-3level.S | 4 ----
arch/arm/mm/proc-v7.S | 2 --
arch/arm/mm/proc-xsc3.S | 2 --
arch/arm/mm/proc-xscale.S | 2 --
arch/arm/plat-versatile/platsmp.c | 6 +++---
67 files changed, 60 insertions(+), 135 deletions(-)
diff --git a/arch/arm/common/mcpm_platsmp.c b/arch/arm/common/mcpm_platsmp.c
index 510e5b1..1bc34c7 100644
--- a/arch/arm/common/mcpm_platsmp.c
+++ b/arch/arm/common/mcpm_platsmp.c
@@ -19,7 +19,7 @@
#include <asm/smp.h>
#include <asm/smp_plat.h>
-static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned int mpidr, pcpu, pcluster, ret;
extern void secondary_startup(void);
@@ -40,7 +40,7 @@ static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *i
return 0;
}
-static void __cpuinit mcpm_secondary_init(unsigned int cpu)
+static void mcpm_secondary_init(unsigned int cpu)
{
mcpm_cpu_powered_up();
}
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index accefe0..e406d57 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -89,7 +89,7 @@ static inline u64 arch_counter_get_cntvct(void)
return cval;
}
-static inline void __cpuinit arch_counter_set_user_access(void)
+static inline void arch_counter_set_user_access(void)
{
u32 cntkctl;
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 5b391a6..529ce99 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -146,7 +146,6 @@ ENDPROC(lookup_processor_type)
* r5 = proc_info pointer in physical address space
* r9 = cpuid (preserved)
*/
- __CPUINIT
__lookup_processor_type:
adr r3, __lookup_processor_type_data
ldmia r3, {r4 - r6}
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 45e8935..9cf6063 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -343,7 +343,6 @@ __turn_mmu_on_loc:
.long __turn_mmu_on_end
#if defined(CONFIG_SMP)
- __CPUINIT
ENTRY(secondary_startup)
/*
* Common entry point for secondary CPUs.
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 1fd749e..7b95de6 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -1020,7 +1020,7 @@ out_mdbgen:
cpumask_or(&debug_err_mask, &debug_err_mask, cpumask_of(cpu));
}
-static int __cpuinit dbg_reset_notify(struct notifier_block *self,
+static int dbg_reset_notify(struct notifier_block *self,
unsigned long action, void *cpu)
{
if ((action & ~CPU_TASKS_FROZEN) == CPU_ONLINE)
@@ -1029,7 +1029,7 @@ static int __cpuinit dbg_reset_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata dbg_reset_nb = {
+static struct notifier_block dbg_reset_nb = {
.notifier_call = dbg_reset_notify,
};
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index 1f2740e..aebe0e9 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -157,8 +157,8 @@ static void cpu_pmu_init(struct arm_pmu *cpu_pmu)
* UNKNOWN at reset, the PMU must be explicitly reset to avoid reading
* junk values out of them.
*/
-static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
- unsigned long action, void *hcpu)
+static int cpu_pmu_notify(struct notifier_block *b, unsigned long action,
+ void *hcpu)
{
if ((action & ~CPU_TASKS_FROZEN) != CPU_STARTING)
return NOTIFY_DONE;
@@ -171,7 +171,7 @@ static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = {
+static struct notifier_block cpu_pmu_hotplug_notifier = {
.notifier_call = cpu_pmu_notify,
};
diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c
index 219f1d7..70ded3f 100644
--- a/arch/arm/kernel/psci_smp.c
+++ b/arch/arm/kernel/psci_smp.c
@@ -46,8 +46,7 @@
extern void secondary_startup(void);
-static int __cpuinit psci_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
+static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (psci_ops.cpu_on)
return psci_ops.cpu_on(cpu_logical_map(cpu),
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index c5fb546..c2b4f8f 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -58,7 +58,7 @@ struct secondary_data secondary_data;
* 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;
enum ipi_msg_type {
IPI_WAKEUP,
@@ -86,7 +86,7 @@ static unsigned long get_arch_pgd(pgd_t *pgd)
return pgdir >> ARCH_PGD_SHIFT;
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
int ret;
@@ -138,7 +138,7 @@ void __init smp_init_cpus(void)
smp_ops.smp_init_cpus();
}
-int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+int boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (smp_ops.smp_boot_secondary)
return smp_ops.smp_boot_secondary(cpu, idle);
@@ -170,7 +170,7 @@ static int platform_cpu_disable(unsigned int cpu)
/*
* __cpu_disable runs on the processor to be shutdown.
*/
-int __cpuinit __cpu_disable(void)
+int __cpu_disable(void)
{
unsigned int cpu = smp_processor_id();
int ret;
@@ -216,7 +216,7 @@ static DECLARE_COMPLETION(cpu_died);
* called on the thread which is asking for a CPU to be shutdown -
* waits until shutdown has completed, or it is timed out.
*/
-void __cpuinit __cpu_die(unsigned int cpu)
+void __cpu_die(unsigned int cpu)
{
if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {
pr_err("CPU%u: cpu didn't die\n", cpu);
@@ -306,7 +306,7 @@ void __ref cpu_die(void)
* Called by both boot and secondaries to move global data into
* per-processor storage.
*/
-static void __cpuinit smp_store_cpu_info(unsigned int cpuid)
+static void smp_store_cpu_info(unsigned int cpuid)
{
struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid);
@@ -322,7 +322,7 @@ static void percpu_timer_setup(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;
@@ -521,7 +521,7 @@ static void broadcast_timer_set_mode(enum clock_event_mode mode,
{
}
-static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
+static void broadcast_timer_setup(struct clock_event_device *evt)
{
evt->name = "dummy_timer";
evt->features = CLOCK_EVT_FEAT_ONESHOT |
@@ -550,7 +550,7 @@ int local_timer_register(struct local_timer_ops *ops)
}
#endif
-static void __cpuinit percpu_timer_setup(void)
+static void percpu_timer_setup(void)
{
unsigned int cpu = smp_processor_id();
struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 90525d9..ed5cb75 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -187,7 +187,7 @@ core_initcall(twd_cpufreq_init);
#endif
-static void __cpuinit twd_calibrate_rate(void)
+static void twd_calibrate_rate(void)
{
unsigned long count;
u64 waitjiffies;
@@ -265,7 +265,7 @@ static void twd_get_clock(struct device_node *np)
/*
* Setup the local clock events for a CPU.
*/
-static int __cpuinit twd_timer_setup(struct clock_event_device *clk)
+static int twd_timer_setup(struct clock_event_device *clk)
{
struct clock_event_device **this_cpu_clk;
int cpu = smp_processor_id();
@@ -308,7 +308,7 @@ static int __cpuinit twd_timer_setup(struct clock_event_device *clk)
return 0;
}
-static struct local_timer_ops twd_lt_ops __cpuinitdata = {
+static struct local_timer_ops twd_lt_ops = {
.setup = twd_timer_setup,
.stop = twd_timer_stop,
};
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
index 64dbfa5..5306de3 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
@@ -86,7 +86,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer)
}
}
-unsigned long __cpuinit calibrate_delay_is_known(void)
+unsigned long calibrate_delay_is_known(void)
{
delay_calibrated = true;
return lpj_fine;
diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S
index 5364d4b..cdd9d91 100644
--- a/arch/arm/mach-exynos/headsmp.S
+++ b/arch/arm/mach-exynos/headsmp.S
@@ -13,8 +13,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* exynos4 specific entry point for secondary CPUs. This provides
* a "holding pen" into which all secondary cores are held until we're
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index deba130..58b43e6 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -75,7 +75,7 @@ static void __iomem *scu_base_addr(void)
static DEFINE_SPINLOCK(boot_lock);
-static void __cpuinit exynos_secondary_init(unsigned int cpu)
+static void exynos_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -90,7 +90,7 @@ static void __cpuinit exynos_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
unsigned long phys_cpu = cpu_logical_map(cpu);
diff --git a/arch/arm/mach-highbank/platsmp.c b/arch/arm/mach-highbank/platsmp.c
index a984573..32d75cf5 100644
--- a/arch/arm/mach-highbank/platsmp.c
+++ b/arch/arm/mach-highbank/platsmp.c
@@ -24,7 +24,7 @@
extern void secondary_startup(void);
-static int __cpuinit highbank_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int highbank_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
highbank_set_cpu_jump(cpu, secondary_startup);
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c
index c6e1ab5..1f24c1f 100644
--- a/arch/arm/mach-imx/platsmp.c
+++ b/arch/arm/mach-imx/platsmp.c
@@ -53,7 +53,7 @@ void imx_scu_standby_enable(void)
writel_relaxed(val, scu_base);
}
-static int __cpuinit imx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int imx_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
imx_set_cpu_jump(cpu, v7_secondary_startup);
imx_enable_cpu(cpu, true);
diff --git a/arch/arm/mach-msm/headsmp.S b/arch/arm/mach-msm/headsmp.S
index bcd5af2..6c62c3f 100644
--- a/arch/arm/mach-msm/headsmp.S
+++ b/arch/arm/mach-msm/headsmp.S
@@ -11,8 +11,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* MSM specific entry point for secondary CPUs. This provides
* a "holding pen" into which all secondary cores are held until we're
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 00cdb0a..3f06edc 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -38,7 +38,7 @@ static inline int get_core_count(void)
return ((read_cpuid_id() >> 4) & 3) + 1;
}
-static void __cpuinit msm_secondary_init(unsigned int cpu)
+static void msm_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -54,7 +54,7 @@ static void __cpuinit msm_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static __cpuinit void prepare_cold_cpu(unsigned int cpu)
+static void prepare_cold_cpu(unsigned int cpu)
{
int ret;
ret = scm_set_boot_addr(virt_to_phys(msm_secondary_startup),
@@ -73,7 +73,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu)
"address\n");
}
-static int __cpuinit msm_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
static int cold_boot_done;
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index b6418fd..8697cfc 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -139,7 +139,7 @@ static struct clocksource msm_clocksource = {
};
#ifdef CONFIG_LOCAL_TIMERS
-static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt)
+static int msm_local_timer_setup(struct clock_event_device *evt)
{
/* Use existing clock_event for cpu 0 */
if (!smp_processor_id())
@@ -164,7 +164,7 @@ static void msm_local_timer_stop(struct clock_event_device *evt)
disable_percpu_irq(evt->irq);
}
-static struct local_timer_ops msm_local_timer_ops __cpuinitdata = {
+static struct local_timer_ops msm_local_timer_ops = {
.setup = msm_local_timer_setup,
.stop = msm_local_timer_stop,
};
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index be11759..4c24303 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -28,7 +28,7 @@
#include <asm/cacheflush.h>
#include "armada-370-xp.h"
-unsigned long __cpuinitdata coherency_phys_base;
+unsigned long coherency_phys_base;
static void __iomem *coherency_base;
static void __iomem *coherency_cpu_base;
diff --git a/arch/arm/mach-mvebu/headsmp.S b/arch/arm/mach-mvebu/headsmp.S
index 7147300..8a1b0c9 100644
--- a/arch/arm/mach-mvebu/headsmp.S
+++ b/arch/arm/mach-mvebu/headsmp.S
@@ -21,8 +21,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* Armada XP specific entry point for secondary CPUs.
* We add the CPU to the coherency fabric and then jump to secondary
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index 93f2f3a..ce81d30 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -71,13 +71,12 @@ void __init set_secondary_cpus_clock(void)
}
}
-static void __cpuinit armada_xp_secondary_init(unsigned int cpu)
+static void armada_xp_secondary_init(unsigned int cpu)
{
armada_xp_mpic_smp_cpu_init();
}
-static int __cpuinit armada_xp_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
+static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
pr_info("Booting CPU %d\n", cpu);
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index 4ea3081..75e9295 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -20,8 +20,6 @@
#include "omap44xx.h"
- __CPUINIT
-
/* Physical address needed since MMU not enabled yet on secondary core */
#define AUX_CORE_BOOT0_PA 0x48281800
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index f993a41..f991016 100644
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -291,7 +291,7 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
* @cpu : CPU ID
* @power_state: CPU low power state.
*/
-int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
{
struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu);
unsigned int cpu_state = 0;
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index 98a1146..8708b2a 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -51,7 +51,7 @@ void __iomem *omap4_get_scu_base(void)
return scu_base;
}
-static void __cpuinit omap4_secondary_init(unsigned int cpu)
+static void omap4_secondary_init(unsigned int cpu)
{
/*
* Configure ACTRL and enable NS SMP bit access on CPU1 on HS device.
@@ -72,7 +72,7 @@ static void __cpuinit omap4_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
static struct clockdomain *cpu1_clkdm;
static bool booted;
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index f8bb3b9..813c615 100644
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -323,8 +323,8 @@ static void irq_save_secure_context(void)
#endif
#ifdef CONFIG_HOTPLUG_CPU
-static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int irq_cpu_hotplug_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)hcpu;
diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S
index 5b8a408d..d86fe33 100644
--- a/arch/arm/mach-prima2/headsmp.S
+++ b/arch/arm/mach-prima2/headsmp.S
@@ -9,8 +9,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* SIRFSOC specific entry point for secondary CPUs. This provides
* a "holding pen" into which all secondary cores are held until we're
diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
index 1c3de7b..3dbcb1a 100644
--- a/arch/arm/mach-prima2/platsmp.c
+++ b/arch/arm/mach-prima2/platsmp.c
@@ -44,7 +44,7 @@ void __init sirfsoc_map_scu(void)
scu_base = (void __iomem *)SIRFSOC_VA(base);
}
-static void __cpuinit sirfsoc_secondary_init(unsigned int cpu)
+static void sirfsoc_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -65,7 +65,7 @@ static struct of_device_id rsc_ids[] = {
{},
};
-static int __cpuinit sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
struct device_node *np;
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index 6f98654..bfd9200 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -23,7 +23,6 @@
#include <linux/init.h>
#include <asm/memory.h>
- __CPUINIT
/*
* Boot code for secondary CPUs.
*
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index 559d1ce..a9d2124 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -14,8 +14,6 @@
#include <linux/init.h>
#include <asm/memory.h>
- __CPUINIT
-
ENTRY(shmobile_invalidate_start)
bl v7_invalidate_l1
b secondary_startup
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 80991b3..22a05a8 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -30,7 +30,7 @@
#define EMEV2_SCU_BASE 0x1e000000
-static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));
return 0;
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 526cfaa..9bdf810 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -81,7 +81,7 @@ static int r8a7779_platform_cpu_kill(unsigned int cpu)
return ret ? ret : 1;
}
-static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
struct r8a7779_pm_ch *ch = NULL;
int ret = -EIO;
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index d613113..d5fc3ed 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -48,7 +48,7 @@ void __init sh73a0_register_twd(void)
}
#endif
-static int __cpuinit sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
cpu = cpu_logical_map(cpu);
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 9004bfb..95c115d 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -10,7 +10,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
.arch armv7-a
ENTRY(secondary_trampoline)
diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c
index b51ce8c..5356a72 100644
--- a/arch/arm/mach-socfpga/platsmp.c
+++ b/arch/arm/mach-socfpga/platsmp.c
@@ -29,7 +29,7 @@
#include "core.h"
-static int __cpuinit socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h
index 904f2c9..a99d90a 100644
--- a/arch/arm/mach-spear/generic.h
+++ b/arch/arm/mach-spear/generic.h
@@ -37,7 +37,7 @@ void __init spear13xx_l2x0_init(void);
void spear_restart(enum reboot_mode, const char *);
void spear13xx_secondary_startup(void);
-void __cpuinit spear13xx_cpu_die(unsigned int cpu);
+void spear13xx_cpu_die(unsigned int cpu);
extern struct smp_operations spear13xx_smp_ops;
diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
index 9c4c722..5c4a198 100644
--- a/arch/arm/mach-spear/platsmp.c
+++ b/arch/arm/mach-spear/platsmp.c
@@ -24,7 +24,7 @@ static DEFINE_SPINLOCK(boot_lock);
static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
-static void __cpuinit spear13xx_secondary_init(unsigned int cpu)
+static void spear13xx_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -40,7 +40,7 @@ static void __cpuinit spear13xx_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 24db4ac..97b33a2 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -35,7 +35,7 @@
static cpumask_t tegra_cpu_init_mask;
-static void __cpuinit tegra_secondary_init(unsigned int cpu)
+static void tegra_secondary_init(unsigned int cpu)
{
cpumask_set_cpu(cpu, &tegra_cpu_init_mask);
}
@@ -167,7 +167,7 @@ static int tegra114_boot_secondary(unsigned int cpu, struct task_struct *idle)
return ret;
}
-static int __cpuinit tegra_boot_secondary(unsigned int cpu,
+static int tegra_boot_secondary(unsigned int cpu,
struct task_struct *idle)
{
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id == TEGRA20)
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 94e69be..261fec1 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -191,7 +191,7 @@ static const char *lp_state[TEGRA_MAX_SUSPEND_MODE] = {
[TEGRA_SUSPEND_LP0] = "LP0",
};
-static int __cpuinit tegra_suspend_enter(suspend_state_t state)
+static int tegra_suspend_enter(suspend_state_t state)
{
enum tegra_suspend_mode mode = tegra_pmc_get_suspend_mode();
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 14d9046..1f296e7 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -54,7 +54,7 @@ static void __iomem *scu_base_addr(void)
static DEFINE_SPINLOCK(boot_lock);
-static void __cpuinit ux500_secondary_init(unsigned int cpu)
+static void ux500_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -69,7 +69,7 @@ static void __cpuinit ux500_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h
index fbbd0e2..3040d21 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@ -27,7 +27,7 @@ extern void secondary_startup(void);
extern char zynq_secondary_trampoline;
extern char zynq_secondary_trampoline_jump;
extern char zynq_secondary_trampoline_end;
-extern int __cpuinit zynq_cpun_start(u32 address, int cpu);
+extern int zynq_cpun_start(u32 address, int cpu);
extern struct smp_operations zynq_smp_ops __initdata;
#endif
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S
index d183cd2..d4cd5f3 100644
--- a/arch/arm/mach-zynq/headsmp.S
+++ b/arch/arm/mach-zynq/headsmp.S
@@ -9,8 +9,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
ENTRY(zynq_secondary_trampoline)
ldr r0, [pc]
bx r0
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index 023f225..689fbbc 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -30,11 +30,11 @@
/*
* Store number of cores in the system
* Because of scu_get_core_count() must be in __init section and can't
- * be called from zynq_cpun_start() because it is in __cpuinit section.
+ * be called from zynq_cpun_start() because it is not in __init section.
*/
static int ncores;
-int __cpuinit zynq_cpun_start(u32 address, int cpu)
+int zynq_cpun_start(u32 address, int cpu)
{
u32 trampoline_code_size = &zynq_secondary_trampoline_end -
&zynq_secondary_trampoline;
@@ -92,7 +92,7 @@ int __cpuinit zynq_cpun_start(u32 address, int cpu)
}
EXPORT_SYMBOL(zynq_cpun_start);
-static int __cpuinit zynq_boot_secondary(unsigned int cpu,
+static int zynq_boot_secondary(unsigned int cpu,
struct task_struct *idle)
{
return zynq_cpun_start(virt_to_phys(secondary_startup), cpu);
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 2bb61e7..d1a2d05 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -443,8 +443,6 @@ ENTRY(cpu_arm1020_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm1020_setup, #function
__arm1020_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 8f96aa4..9d89405 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -425,8 +425,6 @@ ENTRY(cpu_arm1020e_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm1020e_setup, #function
__arm1020e_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 8ebe4a4..6f01a0a 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -407,8 +407,6 @@ ENTRY(cpu_arm1022_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm1022_setup, #function
__arm1022_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 093fc7e..4799a24 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -396,9 +396,6 @@ ENTRY(cpu_arm1026_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
-
- __CPUINIT
-
.type __arm1026_setup, #function
__arm1026_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 0ac908c..d42c37f 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -116,8 +116,6 @@ ENTRY(cpu_arm720_reset)
ENDPROC(cpu_arm720_reset)
.popsection
- __CPUINIT
-
.type __arm710_setup, #function
__arm710_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
index fde2d2a..9b0ae90 100644
--- a/arch/arm/mm/proc-arm740.S
+++ b/arch/arm/mm/proc-arm740.S
@@ -60,8 +60,6 @@ ENTRY(cpu_arm740_reset)
ENDPROC(cpu_arm740_reset)
.popsection
- __CPUINIT
-
.type __arm740_setup, #function
__arm740_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
index 6ddea3e..f6cc3f6 100644
--- a/arch/arm/mm/proc-arm7tdmi.S
+++ b/arch/arm/mm/proc-arm7tdmi.S
@@ -51,8 +51,6 @@ ENTRY(cpu_arm7tdmi_reset)
ENDPROC(cpu_arm7tdmi_reset)
.popsection
- __CPUINIT
-
.type __arm7tdmi_setup, #function
__arm7tdmi_setup:
mov pc, lr
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 2556cf1..549557d 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -410,8 +410,6 @@ ENTRY(cpu_arm920_do_resume)
ENDPROC(cpu_arm920_do_resume)
#endif
- __CPUINIT
-
.type __arm920_setup, #function
__arm920_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 4464c49..2a758b0 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -388,8 +388,6 @@ ENTRY(cpu_arm922_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm922_setup, #function
__arm922_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 281eb9b..97448c3 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -438,8 +438,6 @@ ENTRY(cpu_arm925_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm925_setup, #function
__arm925_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 344c8a5..0f098f4 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -425,8 +425,6 @@ ENTRY(cpu_arm926_do_resume)
ENDPROC(cpu_arm926_do_resume)
#endif
- __CPUINIT
-
.type __arm926_setup, #function
__arm926_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index 8da189d..1c39a70 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -273,8 +273,6 @@ ENDPROC(arm940_dma_unmap_area)
@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
define_cache_functions arm940
- __CPUINIT
-
.type __arm940_setup, #function
__arm940_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index f666cf3..0289cd9 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -326,8 +326,6 @@ ENTRY(cpu_arm946_dcache_clean_area)
mcr p15, 0, r0, c7, c10, 4 @ drain WB
mov pc, lr
- __CPUINIT
-
.type __arm946_setup, #function
__arm946_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
index 8881391..f51197b 100644
--- a/arch/arm/mm/proc-arm9tdmi.S
+++ b/arch/arm/mm/proc-arm9tdmi.S
@@ -51,8 +51,6 @@ ENTRY(cpu_arm9tdmi_reset)
ENDPROC(cpu_arm9tdmi_reset)
.popsection
- __CPUINIT
-
.type __arm9tdmi_setup, #function
__arm9tdmi_setup:
mov pc, lr
diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
index d217e97..824f70d 100644
--- a/arch/arm/mm/proc-fa526.S
+++ b/arch/arm/mm/proc-fa526.S
@@ -136,8 +136,6 @@ ENTRY(cpu_fa526_set_pte_ext)
#endif
mov pc, lr
- __CPUINIT
-
.type __fa526_setup, #function
__fa526_setup:
/* On return of this routine, r0 must carry correct flags for CFG register */
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 4106b09..d5146b9 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -514,8 +514,6 @@ ENTRY(cpu_feroceon_set_pte_ext)
#endif
mov pc, lr
- __CPUINIT
-
.type __feroceon_setup, #function
__feroceon_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index 0b60dd3..40acba5 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -383,8 +383,6 @@ ENTRY(cpu_mohawk_do_resume)
ENDPROC(cpu_mohawk_do_resume)
#endif
- __CPUINIT
-
.type __mohawk_setup, #function
__mohawk_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 775d70f..c45319c 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -159,8 +159,6 @@ ENTRY(cpu_sa110_set_pte_ext)
#endif
mov pc, lr
- __CPUINIT
-
.type __sa110_setup, #function
__sa110_setup:
mov r10, #0
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index d92dfd0..09d241a 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -198,8 +198,6 @@ ENTRY(cpu_sa1100_do_resume)
ENDPROC(cpu_sa1100_do_resume)
#endif
- __CPUINIT
-
.type __sa1100_setup, #function
__sa1100_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 2d1ef87..1128064 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -180,8 +180,6 @@ ENDPROC(cpu_v6_do_resume)
.align
- __CPUINIT
-
/*
* __v6_setup
*
diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S
index 9704097..f64afb9 100644
--- a/arch/arm/mm/proc-v7-2level.S
+++ b/arch/arm/mm/proc-v7-2level.S
@@ -160,8 +160,6 @@ ENDPROC(cpu_v7_set_pte_ext)
mcr p15, 0, \ttbr1, c2, c0, 1 @ load TTB1
.endm
- __CPUINIT
-
/* AT
* TFR EV X F I D LR S
* .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM
@@ -172,5 +170,3 @@ ENDPROC(cpu_v7_set_pte_ext)
.type v7_crval, #object
v7_crval:
crval clear=0x2120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c
-
- .previous
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S
index 5ffe195..c36ac69 100644
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@ -140,8 +140,6 @@ ENDPROC(cpu_v7_set_pte_ext)
mcrr p15, 0, \ttbr0, \zero, c2 @ load TTBR0
.endm
- __CPUINIT
-
/*
* AT
* TFR EV X F IHD LR S
@@ -153,5 +151,3 @@ ENDPROC(cpu_v7_set_pte_ext)
.type v7_crval, #object
v7_crval:
crval clear=0x0120c302, mmuset=0x30c23c7d, ucset=0x00c01c7c
-
- .previous
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index aacb8ca..64b3acb 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -144,8 +144,6 @@ ENTRY(cpu_v7_do_resume)
ENDPROC(cpu_v7_do_resume)
#endif
- __CPUINIT
-
/*
* __v7_setup
*
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index e8efd83..dc16458 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -446,8 +446,6 @@ ENTRY(cpu_xsc3_do_resume)
ENDPROC(cpu_xsc3_do_resume)
#endif
- __CPUINIT
-
.type __xsc3_setup, #function
__xsc3_setup:
mov r0, #PSR_F_BIT|PSR_I_BIT|SVC_MODE
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index e766f88..d19b1cf 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -558,8 +558,6 @@ ENTRY(cpu_xscale_do_resume)
ENDPROC(cpu_xscale_do_resume)
#endif
- __CPUINIT
-
.type __xscale_setup, #function
__xscale_setup:
mcr p15, 0, ip, c7, c7, 0 @ invalidate I, D caches & BTB
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
index 1e1b2d7..39895d8 100644
--- a/arch/arm/plat-versatile/platsmp.c
+++ b/arch/arm/plat-versatile/platsmp.c
@@ -23,7 +23,7 @@
* observers, irrespective of whether they're taking part in coherency
* or not. This is necessary for the hotplug code to work reliably.
*/
-static void __cpuinit write_pen_release(int val)
+static void write_pen_release(int val)
{
pen_release = val;
smp_wmb();
@@ -33,7 +33,7 @@ static void __cpuinit write_pen_release(int val)
static DEFINE_SPINLOCK(boot_lock);
-void __cpuinit versatile_secondary_init(unsigned int cpu)
+void versatile_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -48,7 +48,7 @@ void __cpuinit versatile_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-int __cpuinit versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Russell King, Will Deacon, linux-arm-kernel
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
and are flagged as __cpuinit -- so if we remove the __cpuinit from
the arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
related content into no-ops as early as possible, since that will get
rid of these warnings. In any case, they are temporary and harmless.
This removes all the ARM uses of the __cpuinit macros from C code,
and all __CPUINIT from assembly code. It also had two ".previous"
section statements that were paired off against __CPUINIT
(aka .section ".cpuinit.text") that also get removed here.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/arm/common/mcpm_platsmp.c | 4 ++--
arch/arm/include/asm/arch_timer.h | 2 +-
arch/arm/kernel/head-common.S | 1 -
arch/arm/kernel/head.S | 1 -
arch/arm/kernel/hw_breakpoint.c | 4 ++--
arch/arm/kernel/perf_event_cpu.c | 6 +++---
arch/arm/kernel/psci_smp.c | 3 +--
arch/arm/kernel/smp.c | 18 +++++++++---------
arch/arm/kernel/smp_twd.c | 6 +++---
arch/arm/lib/delay.c | 2 +-
arch/arm/mach-exynos/headsmp.S | 2 --
arch/arm/mach-exynos/platsmp.c | 4 ++--
arch/arm/mach-highbank/platsmp.c | 2 +-
arch/arm/mach-imx/platsmp.c | 2 +-
arch/arm/mach-msm/headsmp.S | 2 --
arch/arm/mach-msm/platsmp.c | 6 +++---
arch/arm/mach-msm/timer.c | 4 ++--
arch/arm/mach-mvebu/coherency.c | 2 +-
arch/arm/mach-mvebu/headsmp.S | 2 --
arch/arm/mach-mvebu/platsmp.c | 5 ++---
arch/arm/mach-omap2/omap-headsmp.S | 2 --
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
arch/arm/mach-omap2/omap-smp.c | 4 ++--
arch/arm/mach-omap2/omap-wakeupgen.c | 4 ++--
arch/arm/mach-prima2/headsmp.S | 2 --
arch/arm/mach-prima2/platsmp.c | 4 ++--
arch/arm/mach-shmobile/headsmp-scu.S | 1 -
arch/arm/mach-shmobile/headsmp.S | 2 --
arch/arm/mach-shmobile/smp-emev2.c | 2 +-
arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
arch/arm/mach-socfpga/headsmp.S | 1 -
arch/arm/mach-socfpga/platsmp.c | 2 +-
arch/arm/mach-spear/generic.h | 2 +-
arch/arm/mach-spear/platsmp.c | 4 ++--
arch/arm/mach-tegra/platsmp.c | 4 ++--
arch/arm/mach-tegra/pm.c | 2 +-
arch/arm/mach-ux500/platsmp.c | 4 ++--
arch/arm/mach-zynq/common.h | 2 +-
arch/arm/mach-zynq/headsmp.S | 2 --
arch/arm/mach-zynq/platsmp.c | 6 +++---
arch/arm/mm/proc-arm1020.S | 2 --
arch/arm/mm/proc-arm1020e.S | 2 --
arch/arm/mm/proc-arm1022.S | 2 --
arch/arm/mm/proc-arm1026.S | 3 ---
arch/arm/mm/proc-arm720.S | 2 --
arch/arm/mm/proc-arm740.S | 2 --
arch/arm/mm/proc-arm7tdmi.S | 2 --
arch/arm/mm/proc-arm920.S | 2 --
arch/arm/mm/proc-arm922.S | 2 --
arch/arm/mm/proc-arm925.S | 2 --
arch/arm/mm/proc-arm926.S | 2 --
arch/arm/mm/proc-arm940.S | 2 --
arch/arm/mm/proc-arm946.S | 2 --
arch/arm/mm/proc-arm9tdmi.S | 2 --
arch/arm/mm/proc-fa526.S | 2 --
arch/arm/mm/proc-feroceon.S | 2 --
arch/arm/mm/proc-mohawk.S | 2 --
arch/arm/mm/proc-sa110.S | 2 --
arch/arm/mm/proc-sa1100.S | 2 --
arch/arm/mm/proc-v6.S | 2 --
arch/arm/mm/proc-v7-2level.S | 4 ----
arch/arm/mm/proc-v7-3level.S | 4 ----
arch/arm/mm/proc-v7.S | 2 --
arch/arm/mm/proc-xsc3.S | 2 --
arch/arm/mm/proc-xscale.S | 2 --
arch/arm/plat-versatile/platsmp.c | 6 +++---
67 files changed, 60 insertions(+), 135 deletions(-)
diff --git a/arch/arm/common/mcpm_platsmp.c b/arch/arm/common/mcpm_platsmp.c
index 510e5b1..1bc34c7 100644
--- a/arch/arm/common/mcpm_platsmp.c
+++ b/arch/arm/common/mcpm_platsmp.c
@@ -19,7 +19,7 @@
#include <asm/smp.h>
#include <asm/smp_plat.h>
-static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned int mpidr, pcpu, pcluster, ret;
extern void secondary_startup(void);
@@ -40,7 +40,7 @@ static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *i
return 0;
}
-static void __cpuinit mcpm_secondary_init(unsigned int cpu)
+static void mcpm_secondary_init(unsigned int cpu)
{
mcpm_cpu_powered_up();
}
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index accefe0..e406d57 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -89,7 +89,7 @@ static inline u64 arch_counter_get_cntvct(void)
return cval;
}
-static inline void __cpuinit arch_counter_set_user_access(void)
+static inline void arch_counter_set_user_access(void)
{
u32 cntkctl;
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 5b391a6..529ce99 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -146,7 +146,6 @@ ENDPROC(lookup_processor_type)
* r5 = proc_info pointer in physical address space
* r9 = cpuid (preserved)
*/
- __CPUINIT
__lookup_processor_type:
adr r3, __lookup_processor_type_data
ldmia r3, {r4 - r6}
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 45e8935..9cf6063 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -343,7 +343,6 @@ __turn_mmu_on_loc:
.long __turn_mmu_on_end
#if defined(CONFIG_SMP)
- __CPUINIT
ENTRY(secondary_startup)
/*
* Common entry point for secondary CPUs.
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 1fd749e..7b95de6 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -1020,7 +1020,7 @@ out_mdbgen:
cpumask_or(&debug_err_mask, &debug_err_mask, cpumask_of(cpu));
}
-static int __cpuinit dbg_reset_notify(struct notifier_block *self,
+static int dbg_reset_notify(struct notifier_block *self,
unsigned long action, void *cpu)
{
if ((action & ~CPU_TASKS_FROZEN) == CPU_ONLINE)
@@ -1029,7 +1029,7 @@ static int __cpuinit dbg_reset_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata dbg_reset_nb = {
+static struct notifier_block dbg_reset_nb = {
.notifier_call = dbg_reset_notify,
};
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index 1f2740e..aebe0e9 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -157,8 +157,8 @@ static void cpu_pmu_init(struct arm_pmu *cpu_pmu)
* UNKNOWN at reset, the PMU must be explicitly reset to avoid reading
* junk values out of them.
*/
-static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
- unsigned long action, void *hcpu)
+static int cpu_pmu_notify(struct notifier_block *b, unsigned long action,
+ void *hcpu)
{
if ((action & ~CPU_TASKS_FROZEN) != CPU_STARTING)
return NOTIFY_DONE;
@@ -171,7 +171,7 @@ static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = {
+static struct notifier_block cpu_pmu_hotplug_notifier = {
.notifier_call = cpu_pmu_notify,
};
diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c
index 219f1d7..70ded3f 100644
--- a/arch/arm/kernel/psci_smp.c
+++ b/arch/arm/kernel/psci_smp.c
@@ -46,8 +46,7 @@
extern void secondary_startup(void);
-static int __cpuinit psci_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
+static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (psci_ops.cpu_on)
return psci_ops.cpu_on(cpu_logical_map(cpu),
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index c5fb546..c2b4f8f 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -58,7 +58,7 @@ struct secondary_data secondary_data;
* 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;
enum ipi_msg_type {
IPI_WAKEUP,
@@ -86,7 +86,7 @@ static unsigned long get_arch_pgd(pgd_t *pgd)
return pgdir >> ARCH_PGD_SHIFT;
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
int ret;
@@ -138,7 +138,7 @@ void __init smp_init_cpus(void)
smp_ops.smp_init_cpus();
}
-int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+int boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (smp_ops.smp_boot_secondary)
return smp_ops.smp_boot_secondary(cpu, idle);
@@ -170,7 +170,7 @@ static int platform_cpu_disable(unsigned int cpu)
/*
* __cpu_disable runs on the processor to be shutdown.
*/
-int __cpuinit __cpu_disable(void)
+int __cpu_disable(void)
{
unsigned int cpu = smp_processor_id();
int ret;
@@ -216,7 +216,7 @@ static DECLARE_COMPLETION(cpu_died);
* called on the thread which is asking for a CPU to be shutdown -
* waits until shutdown has completed, or it is timed out.
*/
-void __cpuinit __cpu_die(unsigned int cpu)
+void __cpu_die(unsigned int cpu)
{
if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) {
pr_err("CPU%u: cpu didn't die\n", cpu);
@@ -306,7 +306,7 @@ void __ref cpu_die(void)
* Called by both boot and secondaries to move global data into
* per-processor storage.
*/
-static void __cpuinit smp_store_cpu_info(unsigned int cpuid)
+static void smp_store_cpu_info(unsigned int cpuid)
{
struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid);
@@ -322,7 +322,7 @@ static void percpu_timer_setup(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;
@@ -521,7 +521,7 @@ static void broadcast_timer_set_mode(enum clock_event_mode mode,
{
}
-static void __cpuinit broadcast_timer_setup(struct clock_event_device *evt)
+static void broadcast_timer_setup(struct clock_event_device *evt)
{
evt->name = "dummy_timer";
evt->features = CLOCK_EVT_FEAT_ONESHOT |
@@ -550,7 +550,7 @@ int local_timer_register(struct local_timer_ops *ops)
}
#endif
-static void __cpuinit percpu_timer_setup(void)
+static void percpu_timer_setup(void)
{
unsigned int cpu = smp_processor_id();
struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 90525d9..ed5cb75 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -187,7 +187,7 @@ core_initcall(twd_cpufreq_init);
#endif
-static void __cpuinit twd_calibrate_rate(void)
+static void twd_calibrate_rate(void)
{
unsigned long count;
u64 waitjiffies;
@@ -265,7 +265,7 @@ static void twd_get_clock(struct device_node *np)
/*
* Setup the local clock events for a CPU.
*/
-static int __cpuinit twd_timer_setup(struct clock_event_device *clk)
+static int twd_timer_setup(struct clock_event_device *clk)
{
struct clock_event_device **this_cpu_clk;
int cpu = smp_processor_id();
@@ -308,7 +308,7 @@ static int __cpuinit twd_timer_setup(struct clock_event_device *clk)
return 0;
}
-static struct local_timer_ops twd_lt_ops __cpuinitdata = {
+static struct local_timer_ops twd_lt_ops = {
.setup = twd_timer_setup,
.stop = twd_timer_stop,
};
diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
index 64dbfa5..5306de3 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
@@ -86,7 +86,7 @@ void __init register_current_timer_delay(const struct delay_timer *timer)
}
}
-unsigned long __cpuinit calibrate_delay_is_known(void)
+unsigned long calibrate_delay_is_known(void)
{
delay_calibrated = true;
return lpj_fine;
diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S
index 5364d4b..cdd9d91 100644
--- a/arch/arm/mach-exynos/headsmp.S
+++ b/arch/arm/mach-exynos/headsmp.S
@@ -13,8 +13,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* exynos4 specific entry point for secondary CPUs. This provides
* a "holding pen" into which all secondary cores are held until we're
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index deba130..58b43e6 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -75,7 +75,7 @@ static void __iomem *scu_base_addr(void)
static DEFINE_SPINLOCK(boot_lock);
-static void __cpuinit exynos_secondary_init(unsigned int cpu)
+static void exynos_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -90,7 +90,7 @@ static void __cpuinit exynos_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
unsigned long phys_cpu = cpu_logical_map(cpu);
diff --git a/arch/arm/mach-highbank/platsmp.c b/arch/arm/mach-highbank/platsmp.c
index a984573..32d75cf5 100644
--- a/arch/arm/mach-highbank/platsmp.c
+++ b/arch/arm/mach-highbank/platsmp.c
@@ -24,7 +24,7 @@
extern void secondary_startup(void);
-static int __cpuinit highbank_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int highbank_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
highbank_set_cpu_jump(cpu, secondary_startup);
arch_send_wakeup_ipi_mask(cpumask_of(cpu));
diff --git a/arch/arm/mach-imx/platsmp.c b/arch/arm/mach-imx/platsmp.c
index c6e1ab5..1f24c1f 100644
--- a/arch/arm/mach-imx/platsmp.c
+++ b/arch/arm/mach-imx/platsmp.c
@@ -53,7 +53,7 @@ void imx_scu_standby_enable(void)
writel_relaxed(val, scu_base);
}
-static int __cpuinit imx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int imx_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
imx_set_cpu_jump(cpu, v7_secondary_startup);
imx_enable_cpu(cpu, true);
diff --git a/arch/arm/mach-msm/headsmp.S b/arch/arm/mach-msm/headsmp.S
index bcd5af2..6c62c3f 100644
--- a/arch/arm/mach-msm/headsmp.S
+++ b/arch/arm/mach-msm/headsmp.S
@@ -11,8 +11,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* MSM specific entry point for secondary CPUs. This provides
* a "holding pen" into which all secondary cores are held until we're
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 00cdb0a..3f06edc 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -38,7 +38,7 @@ static inline int get_core_count(void)
return ((read_cpuid_id() >> 4) & 3) + 1;
}
-static void __cpuinit msm_secondary_init(unsigned int cpu)
+static void msm_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -54,7 +54,7 @@ static void __cpuinit msm_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static __cpuinit void prepare_cold_cpu(unsigned int cpu)
+static void prepare_cold_cpu(unsigned int cpu)
{
int ret;
ret = scm_set_boot_addr(virt_to_phys(msm_secondary_startup),
@@ -73,7 +73,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu)
"address\n");
}
-static int __cpuinit msm_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
static int cold_boot_done;
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index b6418fd..8697cfc 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -139,7 +139,7 @@ static struct clocksource msm_clocksource = {
};
#ifdef CONFIG_LOCAL_TIMERS
-static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt)
+static int msm_local_timer_setup(struct clock_event_device *evt)
{
/* Use existing clock_event for cpu 0 */
if (!smp_processor_id())
@@ -164,7 +164,7 @@ static void msm_local_timer_stop(struct clock_event_device *evt)
disable_percpu_irq(evt->irq);
}
-static struct local_timer_ops msm_local_timer_ops __cpuinitdata = {
+static struct local_timer_ops msm_local_timer_ops = {
.setup = msm_local_timer_setup,
.stop = msm_local_timer_stop,
};
diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index be11759..4c24303 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -28,7 +28,7 @@
#include <asm/cacheflush.h>
#include "armada-370-xp.h"
-unsigned long __cpuinitdata coherency_phys_base;
+unsigned long coherency_phys_base;
static void __iomem *coherency_base;
static void __iomem *coherency_cpu_base;
diff --git a/arch/arm/mach-mvebu/headsmp.S b/arch/arm/mach-mvebu/headsmp.S
index 7147300..8a1b0c9 100644
--- a/arch/arm/mach-mvebu/headsmp.S
+++ b/arch/arm/mach-mvebu/headsmp.S
@@ -21,8 +21,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* Armada XP specific entry point for secondary CPUs.
* We add the CPU to the coherency fabric and then jump to secondary
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index 93f2f3a..ce81d30 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -71,13 +71,12 @@ void __init set_secondary_cpus_clock(void)
}
}
-static void __cpuinit armada_xp_secondary_init(unsigned int cpu)
+static void armada_xp_secondary_init(unsigned int cpu)
{
armada_xp_mpic_smp_cpu_init();
}
-static int __cpuinit armada_xp_boot_secondary(unsigned int cpu,
- struct task_struct *idle)
+static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
pr_info("Booting CPU %d\n", cpu);
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index 4ea3081..75e9295 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -20,8 +20,6 @@
#include "omap44xx.h"
- __CPUINIT
-
/* Physical address needed since MMU not enabled yet on secondary core */
#define AUX_CORE_BOOT0_PA 0x48281800
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index f993a41..f991016 100644
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -291,7 +291,7 @@ int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
* @cpu : CPU ID
* @power_state: CPU low power state.
*/
-int __cpuinit omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
{
struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu);
unsigned int cpu_state = 0;
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index 98a1146..8708b2a 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -51,7 +51,7 @@ void __iomem *omap4_get_scu_base(void)
return scu_base;
}
-static void __cpuinit omap4_secondary_init(unsigned int cpu)
+static void omap4_secondary_init(unsigned int cpu)
{
/*
* Configure ACTRL and enable NS SMP bit access on CPU1 on HS device.
@@ -72,7 +72,7 @@ static void __cpuinit omap4_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
static struct clockdomain *cpu1_clkdm;
static bool booted;
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
index f8bb3b9..813c615 100644
--- a/arch/arm/mach-omap2/omap-wakeupgen.c
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -323,8 +323,8 @@ static void irq_save_secure_context(void)
#endif
#ifdef CONFIG_HOTPLUG_CPU
-static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int irq_cpu_hotplug_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)hcpu;
diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S
index 5b8a408d..d86fe33 100644
--- a/arch/arm/mach-prima2/headsmp.S
+++ b/arch/arm/mach-prima2/headsmp.S
@@ -9,8 +9,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
/*
* SIRFSOC specific entry point for secondary CPUs. This provides
* a "holding pen" into which all secondary cores are held until we're
diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
index 1c3de7b..3dbcb1a 100644
--- a/arch/arm/mach-prima2/platsmp.c
+++ b/arch/arm/mach-prima2/platsmp.c
@@ -44,7 +44,7 @@ void __init sirfsoc_map_scu(void)
scu_base = (void __iomem *)SIRFSOC_VA(base);
}
-static void __cpuinit sirfsoc_secondary_init(unsigned int cpu)
+static void sirfsoc_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -65,7 +65,7 @@ static struct of_device_id rsc_ids[] = {
{},
};
-static int __cpuinit sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
struct device_node *np;
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index 6f98654..bfd9200 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -23,7 +23,6 @@
#include <linux/init.h>
#include <asm/memory.h>
- __CPUINIT
/*
* Boot code for secondary CPUs.
*
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index 559d1ce..a9d2124 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -14,8 +14,6 @@
#include <linux/init.h>
#include <asm/memory.h>
- __CPUINIT
-
ENTRY(shmobile_invalidate_start)
bl v7_invalidate_l1
b secondary_startup
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 80991b3..22a05a8 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -30,7 +30,7 @@
#define EMEV2_SCU_BASE 0x1e000000
-static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));
return 0;
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 526cfaa..9bdf810 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -81,7 +81,7 @@ static int r8a7779_platform_cpu_kill(unsigned int cpu)
return ret ? ret : 1;
}
-static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
struct r8a7779_pm_ch *ch = NULL;
int ret = -EIO;
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index d613113..d5fc3ed 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -48,7 +48,7 @@ void __init sh73a0_register_twd(void)
}
#endif
-static int __cpuinit sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
cpu = cpu_logical_map(cpu);
diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 9004bfb..95c115d 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -10,7 +10,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
.arch armv7-a
ENTRY(secondary_trampoline)
diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c
index b51ce8c..5356a72 100644
--- a/arch/arm/mach-socfpga/platsmp.c
+++ b/arch/arm/mach-socfpga/platsmp.c
@@ -29,7 +29,7 @@
#include "core.h"
-static int __cpuinit socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int socfpga_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
int trampoline_size = &secondary_trampoline_end - &secondary_trampoline;
diff --git a/arch/arm/mach-spear/generic.h b/arch/arm/mach-spear/generic.h
index 904f2c9..a99d90a 100644
--- a/arch/arm/mach-spear/generic.h
+++ b/arch/arm/mach-spear/generic.h
@@ -37,7 +37,7 @@ void __init spear13xx_l2x0_init(void);
void spear_restart(enum reboot_mode, const char *);
void spear13xx_secondary_startup(void);
-void __cpuinit spear13xx_cpu_die(unsigned int cpu);
+void spear13xx_cpu_die(unsigned int cpu);
extern struct smp_operations spear13xx_smp_ops;
diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
index 9c4c722..5c4a198 100644
--- a/arch/arm/mach-spear/platsmp.c
+++ b/arch/arm/mach-spear/platsmp.c
@@ -24,7 +24,7 @@ static DEFINE_SPINLOCK(boot_lock);
static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
-static void __cpuinit spear13xx_secondary_init(unsigned int cpu)
+static void spear13xx_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -40,7 +40,7 @@ static void __cpuinit spear13xx_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 24db4ac..97b33a2 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -35,7 +35,7 @@
static cpumask_t tegra_cpu_init_mask;
-static void __cpuinit tegra_secondary_init(unsigned int cpu)
+static void tegra_secondary_init(unsigned int cpu)
{
cpumask_set_cpu(cpu, &tegra_cpu_init_mask);
}
@@ -167,7 +167,7 @@ static int tegra114_boot_secondary(unsigned int cpu, struct task_struct *idle)
return ret;
}
-static int __cpuinit tegra_boot_secondary(unsigned int cpu,
+static int tegra_boot_secondary(unsigned int cpu,
struct task_struct *idle)
{
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id == TEGRA20)
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 94e69be..261fec1 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -191,7 +191,7 @@ static const char *lp_state[TEGRA_MAX_SUSPEND_MODE] = {
[TEGRA_SUSPEND_LP0] = "LP0",
};
-static int __cpuinit tegra_suspend_enter(suspend_state_t state)
+static int tegra_suspend_enter(suspend_state_t state)
{
enum tegra_suspend_mode mode = tegra_pmc_get_suspend_mode();
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 14d9046..1f296e7 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -54,7 +54,7 @@ static void __iomem *scu_base_addr(void)
static DEFINE_SPINLOCK(boot_lock);
-static void __cpuinit ux500_secondary_init(unsigned int cpu)
+static void ux500_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -69,7 +69,7 @@ static void __cpuinit ux500_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-static int __cpuinit ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h
index fbbd0e2..3040d21 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@ -27,7 +27,7 @@ extern void secondary_startup(void);
extern char zynq_secondary_trampoline;
extern char zynq_secondary_trampoline_jump;
extern char zynq_secondary_trampoline_end;
-extern int __cpuinit zynq_cpun_start(u32 address, int cpu);
+extern int zynq_cpun_start(u32 address, int cpu);
extern struct smp_operations zynq_smp_ops __initdata;
#endif
diff --git a/arch/arm/mach-zynq/headsmp.S b/arch/arm/mach-zynq/headsmp.S
index d183cd2..d4cd5f3 100644
--- a/arch/arm/mach-zynq/headsmp.S
+++ b/arch/arm/mach-zynq/headsmp.S
@@ -9,8 +9,6 @@
#include <linux/linkage.h>
#include <linux/init.h>
- __CPUINIT
-
ENTRY(zynq_secondary_trampoline)
ldr r0, [pc]
bx r0
diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
index 023f225..689fbbc 100644
--- a/arch/arm/mach-zynq/platsmp.c
+++ b/arch/arm/mach-zynq/platsmp.c
@@ -30,11 +30,11 @@
/*
* Store number of cores in the system
* Because of scu_get_core_count() must be in __init section and can't
- * be called from zynq_cpun_start() because it is in __cpuinit section.
+ * be called from zynq_cpun_start() because it is not in __init section.
*/
static int ncores;
-int __cpuinit zynq_cpun_start(u32 address, int cpu)
+int zynq_cpun_start(u32 address, int cpu)
{
u32 trampoline_code_size = &zynq_secondary_trampoline_end -
&zynq_secondary_trampoline;
@@ -92,7 +92,7 @@ int __cpuinit zynq_cpun_start(u32 address, int cpu)
}
EXPORT_SYMBOL(zynq_cpun_start);
-static int __cpuinit zynq_boot_secondary(unsigned int cpu,
+static int zynq_boot_secondary(unsigned int cpu,
struct task_struct *idle)
{
return zynq_cpun_start(virt_to_phys(secondary_startup), cpu);
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 2bb61e7..d1a2d05 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -443,8 +443,6 @@ ENTRY(cpu_arm1020_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm1020_setup, #function
__arm1020_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 8f96aa4..9d89405 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -425,8 +425,6 @@ ENTRY(cpu_arm1020e_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm1020e_setup, #function
__arm1020e_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 8ebe4a4..6f01a0a 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -407,8 +407,6 @@ ENTRY(cpu_arm1022_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm1022_setup, #function
__arm1022_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 093fc7e..4799a24 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -396,9 +396,6 @@ ENTRY(cpu_arm1026_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
-
- __CPUINIT
-
.type __arm1026_setup, #function
__arm1026_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 0ac908c..d42c37f 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -116,8 +116,6 @@ ENTRY(cpu_arm720_reset)
ENDPROC(cpu_arm720_reset)
.popsection
- __CPUINIT
-
.type __arm710_setup, #function
__arm710_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
index fde2d2a..9b0ae90 100644
--- a/arch/arm/mm/proc-arm740.S
+++ b/arch/arm/mm/proc-arm740.S
@@ -60,8 +60,6 @@ ENTRY(cpu_arm740_reset)
ENDPROC(cpu_arm740_reset)
.popsection
- __CPUINIT
-
.type __arm740_setup, #function
__arm740_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
index 6ddea3e..f6cc3f6 100644
--- a/arch/arm/mm/proc-arm7tdmi.S
+++ b/arch/arm/mm/proc-arm7tdmi.S
@@ -51,8 +51,6 @@ ENTRY(cpu_arm7tdmi_reset)
ENDPROC(cpu_arm7tdmi_reset)
.popsection
- __CPUINIT
-
.type __arm7tdmi_setup, #function
__arm7tdmi_setup:
mov pc, lr
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 2556cf1..549557d 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -410,8 +410,6 @@ ENTRY(cpu_arm920_do_resume)
ENDPROC(cpu_arm920_do_resume)
#endif
- __CPUINIT
-
.type __arm920_setup, #function
__arm920_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 4464c49..2a758b0 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -388,8 +388,6 @@ ENTRY(cpu_arm922_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm922_setup, #function
__arm922_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 281eb9b..97448c3 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -438,8 +438,6 @@ ENTRY(cpu_arm925_set_pte_ext)
#endif /* CONFIG_MMU */
mov pc, lr
- __CPUINIT
-
.type __arm925_setup, #function
__arm925_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 344c8a5..0f098f4 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -425,8 +425,6 @@ ENTRY(cpu_arm926_do_resume)
ENDPROC(cpu_arm926_do_resume)
#endif
- __CPUINIT
-
.type __arm926_setup, #function
__arm926_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index 8da189d..1c39a70 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -273,8 +273,6 @@ ENDPROC(arm940_dma_unmap_area)
@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)
define_cache_functions arm940
- __CPUINIT
-
.type __arm940_setup, #function
__arm940_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index f666cf3..0289cd9 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -326,8 +326,6 @@ ENTRY(cpu_arm946_dcache_clean_area)
mcr p15, 0, r0, c7, c10, 4 @ drain WB
mov pc, lr
- __CPUINIT
-
.type __arm946_setup, #function
__arm946_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
index 8881391..f51197b 100644
--- a/arch/arm/mm/proc-arm9tdmi.S
+++ b/arch/arm/mm/proc-arm9tdmi.S
@@ -51,8 +51,6 @@ ENTRY(cpu_arm9tdmi_reset)
ENDPROC(cpu_arm9tdmi_reset)
.popsection
- __CPUINIT
-
.type __arm9tdmi_setup, #function
__arm9tdmi_setup:
mov pc, lr
diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
index d217e97..824f70d 100644
--- a/arch/arm/mm/proc-fa526.S
+++ b/arch/arm/mm/proc-fa526.S
@@ -136,8 +136,6 @@ ENTRY(cpu_fa526_set_pte_ext)
#endif
mov pc, lr
- __CPUINIT
-
.type __fa526_setup, #function
__fa526_setup:
/* On return of this routine, r0 must carry correct flags for CFG register */
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 4106b09..d5146b9 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -514,8 +514,6 @@ ENTRY(cpu_feroceon_set_pte_ext)
#endif
mov pc, lr
- __CPUINIT
-
.type __feroceon_setup, #function
__feroceon_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index 0b60dd3..40acba5 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -383,8 +383,6 @@ ENTRY(cpu_mohawk_do_resume)
ENDPROC(cpu_mohawk_do_resume)
#endif
- __CPUINIT
-
.type __mohawk_setup, #function
__mohawk_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 775d70f..c45319c 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -159,8 +159,6 @@ ENTRY(cpu_sa110_set_pte_ext)
#endif
mov pc, lr
- __CPUINIT
-
.type __sa110_setup, #function
__sa110_setup:
mov r10, #0
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index d92dfd0..09d241a 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -198,8 +198,6 @@ ENTRY(cpu_sa1100_do_resume)
ENDPROC(cpu_sa1100_do_resume)
#endif
- __CPUINIT
-
.type __sa1100_setup, #function
__sa1100_setup:
mov r0, #0
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 2d1ef87..1128064 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -180,8 +180,6 @@ ENDPROC(cpu_v6_do_resume)
.align
- __CPUINIT
-
/*
* __v6_setup
*
diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S
index 9704097..f64afb9 100644
--- a/arch/arm/mm/proc-v7-2level.S
+++ b/arch/arm/mm/proc-v7-2level.S
@@ -160,8 +160,6 @@ ENDPROC(cpu_v7_set_pte_ext)
mcr p15, 0, \ttbr1, c2, c0, 1 @ load TTB1
.endm
- __CPUINIT
-
/* AT
* TFR EV X F I D LR S
* .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM
@@ -172,5 +170,3 @@ ENDPROC(cpu_v7_set_pte_ext)
.type v7_crval, #object
v7_crval:
crval clear=0x2120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c
-
- .previous
diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S
index 5ffe195..c36ac69 100644
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@ -140,8 +140,6 @@ ENDPROC(cpu_v7_set_pte_ext)
mcrr p15, 0, \ttbr0, \zero, c2 @ load TTBR0
.endm
- __CPUINIT
-
/*
* AT
* TFR EV X F IHD LR S
@@ -153,5 +151,3 @@ ENDPROC(cpu_v7_set_pte_ext)
.type v7_crval, #object
v7_crval:
crval clear=0x0120c302, mmuset=0x30c23c7d, ucset=0x00c01c7c
-
- .previous
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index aacb8ca..64b3acb 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -144,8 +144,6 @@ ENTRY(cpu_v7_do_resume)
ENDPROC(cpu_v7_do_resume)
#endif
- __CPUINIT
-
/*
* __v7_setup
*
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index e8efd83..dc16458 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -446,8 +446,6 @@ ENTRY(cpu_xsc3_do_resume)
ENDPROC(cpu_xsc3_do_resume)
#endif
- __CPUINIT
-
.type __xsc3_setup, #function
__xsc3_setup:
mov r0, #PSR_F_BIT|PSR_I_BIT|SVC_MODE
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index e766f88..d19b1cf 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -558,8 +558,6 @@ ENTRY(cpu_xscale_do_resume)
ENDPROC(cpu_xscale_do_resume)
#endif
- __CPUINIT
-
.type __xscale_setup, #function
__xscale_setup:
mcr p15, 0, ip, c7, c7, 0 @ invalidate I, D caches & BTB
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
index 1e1b2d7..39895d8 100644
--- a/arch/arm/plat-versatile/platsmp.c
+++ b/arch/arm/plat-versatile/platsmp.c
@@ -23,7 +23,7 @@
* observers, irrespective of whether they're taking part in coherency
* or not. This is necessary for the hotplug code to work reliably.
*/
-static void __cpuinit write_pen_release(int val)
+static void write_pen_release(int val)
{
pen_release = val;
smp_wmb();
@@ -33,7 +33,7 @@ static void __cpuinit write_pen_release(int val)
static DEFINE_SPINLOCK(boot_lock);
-void __cpuinit versatile_secondary_init(unsigned int cpu)
+void versatile_secondary_init(unsigned int cpu)
{
/*
* let the primary processor know we're out of the
@@ -48,7 +48,7 @@ void __cpuinit versatile_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-int __cpuinit versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
2013-06-24 19:30 ` Paul Gortmaker
(?)
@ 2013-07-02 8:52 ` Joseph Lo
-1 siblings, 0 replies; 88+ messages in thread
From: Joseph Lo @ 2013-07-02 8:52 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel@vger.kernel.org, Russell King,
linux-arm-kernel@lists.infradead.org, Will Deacon, linux-tegra
Adding linux-tegra in Cc.
On Tue, 2013-06-25 at 03:30 +0800, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> and are flagged as __cpuinit -- so if we remove the __cpuinit from
> the arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> related content into no-ops as early as possible, since that will get
> rid of these warnings. In any case, they are temporary and harmless.
>
> This removes all the ARM uses of the __cpuinit macros from C code,
> and all __CPUINIT from assembly code. It also had two ".previous"
> section statements that were paired off against __CPUINIT
> (aka .section ".cpuinit.text") that also get removed here.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
Hi Paul,
I just tested this series on Tegra platform. It looks broken CPU hotplug
function for Tegra at least. The CPU can't plug-in after unplugging. And
the system resume function also not working when "enable_nonboot_cpus".
Both of the issue cause system hang up. Are we missing something for
__cpuinit removal work?
Thanks,
Joseph
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
@ 2013-07-02 8:52 ` Joseph Lo
0 siblings, 0 replies; 88+ messages in thread
From: Joseph Lo @ 2013-07-02 8:52 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel@vger.kernel.org, Russell King,
linux-arm-kernel@lists.infradead.org, Will Deacon, linux-tegra
Adding linux-tegra in Cc.
On Tue, 2013-06-25 at 03:30 +0800, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> and are flagged as __cpuinit -- so if we remove the __cpuinit from
> the arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> related content into no-ops as early as possible, since that will get
> rid of these warnings. In any case, they are temporary and harmless.
>
> This removes all the ARM uses of the __cpuinit macros from C code,
> and all __CPUINIT from assembly code. It also had two ".previous"
> section statements that were paired off against __CPUINIT
> (aka .section ".cpuinit.text") that also get removed here.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
Hi Paul,
I just tested this series on Tegra platform. It looks broken CPU hotplug
function for Tegra at least. The CPU can't plug-in after unplugging. And
the system resume function also not working when "enable_nonboot_cpus".
Both of the issue cause system hang up. Are we missing something for
__cpuinit removal work?
Thanks,
Joseph
^ permalink raw reply [flat|nested] 88+ messages in thread* [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
@ 2013-07-02 8:52 ` Joseph Lo
0 siblings, 0 replies; 88+ messages in thread
From: Joseph Lo @ 2013-07-02 8:52 UTC (permalink / raw)
To: linux-arm-kernel
Adding linux-tegra in Cc.
On Tue, 2013-06-25 at 03:30 +0800, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> and are flagged as __cpuinit -- so if we remove the __cpuinit from
> the arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> related content into no-ops as early as possible, since that will get
> rid of these warnings. In any case, they are temporary and harmless.
>
> This removes all the ARM uses of the __cpuinit macros from C code,
> and all __CPUINIT from assembly code. It also had two ".previous"
> section statements that were paired off against __CPUINIT
> (aka .section ".cpuinit.text") that also get removed here.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
Hi Paul,
I just tested this series on Tegra platform. It looks broken CPU hotplug
function for Tegra at least. The CPU can't plug-in after unplugging. And
the system resume function also not working when "enable_nonboot_cpus".
Both of the issue cause system hang up. Are we missing something for
__cpuinit removal work?
Thanks,
Joseph
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
2013-07-02 8:52 ` Joseph Lo
@ 2013-07-02 8:58 ` Russell King - ARM Linux
-1 siblings, 0 replies; 88+ messages in thread
From: Russell King - ARM Linux @ 2013-07-02 8:58 UTC (permalink / raw)
To: Joseph Lo
Cc: Paul Gortmaker, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, Will Deacon, linux-tegra
On Tue, Jul 02, 2013 at 04:52:00PM +0800, Joseph Lo wrote:
> I just tested this series on Tegra platform. It looks broken CPU hotplug
> function for Tegra at least. The CPU can't plug-in after unplugging. And
> the system resume function also not working when "enable_nonboot_cpus".
>
> Both of the issue cause system hang up. Are we missing something for
> __cpuinit removal work?
Check that any assembly code you're using where the __CPUINIT* marker has
been removed is not preceded by an __INIT or similar. This code needs
to end up in the normal .text, .data or .bss sections now.
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
@ 2013-07-02 8:58 ` Russell King - ARM Linux
0 siblings, 0 replies; 88+ messages in thread
From: Russell King - ARM Linux @ 2013-07-02 8:58 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 02, 2013 at 04:52:00PM +0800, Joseph Lo wrote:
> I just tested this series on Tegra platform. It looks broken CPU hotplug
> function for Tegra at least. The CPU can't plug-in after unplugging. And
> the system resume function also not working when "enable_nonboot_cpus".
>
> Both of the issue cause system hang up. Are we missing something for
> __cpuinit removal work?
Check that any assembly code you're using where the __CPUINIT* marker has
been removed is not preceded by an __INIT or similar. This code needs
to end up in the normal .text, .data or .bss sections now.
^ permalink raw reply [flat|nested] 88+ messages in thread
[parent not found: <20130702085818.GD24642-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org>]
* Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
2013-07-02 8:58 ` Russell King - ARM Linux
(?)
@ 2013-07-02 17:53 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-07-02 17:53 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Joseph Lo, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Will Deacon, linux-tegra-u79uwXL29TY76Z2rM5mHXA
[Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users] On 02/07/2013 (Tue 09:58) Russell King - ARM Linux wrote:
> On Tue, Jul 02, 2013 at 04:52:00PM +0800, Joseph Lo wrote:
> > I just tested this series on Tegra platform. It looks broken CPU hotplug
> > function for Tegra at least. The CPU can't plug-in after unplugging. And
> > the system resume function also not working when "enable_nonboot_cpus".
> >
> > Both of the issue cause system hang up. Are we missing something for
> > __cpuinit removal work?
>
> Check that any assembly code you're using where the __CPUINIT* marker has
> been removed is not preceded by an __INIT or similar. This code needs
> to end up in the normal .text, .data or .bss sections now.
Yes, As Russell says it is entirely possible that the earlier section
was __INIT and there was already a missing __FINIT (or .previous).
Hence what was __cpuinit got grandfathered into __INIT instead of
.text/.data/.bss
I'm offline at the moment but will double check myself later this
evening if nothing obvious has been found by then.
Thanks,
Paul.
--
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
@ 2013-07-02 17:53 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-07-02 17:53 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Joseph Lo, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, Will Deacon, linux-tegra
[Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users] On 02/07/2013 (Tue 09:58) Russell King - ARM Linux wrote:
> On Tue, Jul 02, 2013 at 04:52:00PM +0800, Joseph Lo wrote:
> > I just tested this series on Tegra platform. It looks broken CPU hotplug
> > function for Tegra at least. The CPU can't plug-in after unplugging. And
> > the system resume function also not working when "enable_nonboot_cpus".
> >
> > Both of the issue cause system hang up. Are we missing something for
> > __cpuinit removal work?
>
> Check that any assembly code you're using where the __CPUINIT* marker has
> been removed is not preceded by an __INIT or similar. This code needs
> to end up in the normal .text, .data or .bss sections now.
Yes, As Russell says it is entirely possible that the earlier section
was __INIT and there was already a missing __FINIT (or .previous).
Hence what was __cpuinit got grandfathered into __INIT instead of
.text/.data/.bss
I'm offline at the moment but will double check myself later this
evening if nothing obvious has been found by then.
Thanks,
Paul.
--
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users
@ 2013-07-02 17:53 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-07-02 17:53 UTC (permalink / raw)
To: linux-arm-kernel
[Re: [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users] On 02/07/2013 (Tue 09:58) Russell King - ARM Linux wrote:
> On Tue, Jul 02, 2013 at 04:52:00PM +0800, Joseph Lo wrote:
> > I just tested this series on Tegra platform. It looks broken CPU hotplug
> > function for Tegra at least. The CPU can't plug-in after unplugging. And
> > the system resume function also not working when "enable_nonboot_cpus".
> >
> > Both of the issue cause system hang up. Are we missing something for
> > __cpuinit removal work?
>
> Check that any assembly code you're using where the __CPUINIT* marker has
> been removed is not preceded by an __INIT or similar. This code needs
> to end up in the normal .text, .data or .bss sections now.
Yes, As Russell says it is entirely possible that the earlier section
was __INIT and there was already a missing __FINIT (or .previous).
Hence what was __cpuinit got grandfathered into __INIT instead of
.text/.data/.bss
I'm offline at the moment but will double check myself later this
evening if nothing obvious has been found by then.
Thanks,
Paul.
--
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 08/32] sparc: delete __cpuinit/__CPUINIT usage from all users
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, David S. Miller, sparclinux
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/sparc uses of the __cpuinit macros from
C files and removes __CPUINIT from assembly files. Note that even
though arch/sparc/kernel/trampoline_64.S has instances of ".previous"
in it, they are all paired off against explicit ".section" directives,
and not implicitly paired with __CPUINIT (unlike mips and arm were).
[1] https://lkml.org/lkml/2013/5/20/589
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[I worry - that any trampoline code that was __cpuinit might possibly
end up linked at a different place now. The concern there being that
implicit address expectations now get violated, and silent boot failures
result (as a worst case). Compile tested but not boot tested.]
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/sparc/kernel/ds.c | 11 ++++-------
arch/sparc/kernel/entry.h | 2 +-
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/irq_64.c | 5 +++--
arch/sparc/kernel/leon_smp.c | 10 +++++-----
arch/sparc/kernel/mdesc.c | 34 +++++++++++++++++-----------------
arch/sparc/kernel/smp_32.c | 20 ++++++++++----------
arch/sparc/kernel/smp_64.c | 9 +++++----
arch/sparc/kernel/sun4d_smp.c | 6 +++---
arch/sparc/kernel/sun4m_smp.c | 6 +++---
arch/sparc/kernel/sysfs.c | 4 ++--
arch/sparc/kernel/trampoline_32.S | 3 ---
arch/sparc/kernel/trampoline_64.S | 2 --
arch/sparc/mm/init_64.c | 2 +-
arch/sparc/mm/srmmu.c | 12 ++++++------
15 files changed, 60 insertions(+), 67 deletions(-)
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 5ef48da..92dbf79 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -528,10 +528,8 @@ static void dr_cpu_mark(struct ds_data *resp, int cpu, int ncpus,
}
}
-static int __cpuinit dr_cpu_configure(struct ds_info *dp,
- struct ds_cap_state *cp,
- u64 req_num,
- cpumask_t *mask)
+static int dr_cpu_configure(struct ds_info *dp, struct ds_cap_state *cp,
+ u64 req_num, cpumask_t *mask)
{
struct ds_data *resp;
int resp_len, ncpus, cpu;
@@ -627,9 +625,8 @@ static int dr_cpu_unconfigure(struct ds_info *dp,
return 0;
}
-static void __cpuinit dr_cpu_data(struct ds_info *dp,
- struct ds_cap_state *cp,
- void *buf, int len)
+static void dr_cpu_data(struct ds_info *dp, struct ds_cap_state *cp, void *buf,
+ int len)
{
struct ds_data *data = buf;
struct dr_cpu_tag *tag = (struct dr_cpu_tag *) (data + 1);
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h
index cc3c5cb..9c179fb 100644
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
@@ -250,7 +250,7 @@ extern struct ino_bucket *ivector_table;
extern unsigned long ivector_table_pa;
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 /* CONFIG_SPARC32 */
#endif /* _ENTRY_H */
diff --git a/arch/sparc/kernel/hvtramp.S b/arch/sparc/kernel/hvtramp.S
index 605c960..4eb1a5a 100644
--- a/arch/sparc/kernel/hvtramp.S
+++ b/arch/sparc/kernel/hvtramp.S
@@ -16,7 +16,6 @@
#include <asm/asi.h>
#include <asm/pil.h>
- __CPUINIT
.align 8
.globl hv_cpu_startup, hv_cpu_startup_end
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 9bcbbe2..d4840ce 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -835,7 +835,8 @@ void notrace init_irqwork_curcpu(void)
* Therefore you cannot make any OBP calls, not even prom_printf,
* from these two routines.
*/
-static void __cpuinit notrace register_one_mondo(unsigned long paddr, unsigned long type, unsigned long qmask)
+static void notrace register_one_mondo(unsigned long paddr, unsigned long type,
+ unsigned long qmask)
{
unsigned long num_entries = (qmask + 1) / 64;
unsigned long status;
@@ -848,7 +849,7 @@ static void __cpuinit notrace register_one_mondo(unsigned long paddr, unsigned l
}
}
-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];
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index d7aa524..6edf955 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -54,7 +54,7 @@ extern ctxd_t *srmmu_ctx_table_phys;
static int smp_processors_ready;
extern volatile unsigned long cpu_callin_map[NR_CPUS];
extern cpumask_t smp_commenced_mask;
-void __cpuinit leon_configure_cache_smp(void);
+void leon_configure_cache_smp(void);
static void leon_ipi_init(void);
/* IRQ number of LEON IPIs */
@@ -69,12 +69,12 @@ static inline unsigned long do_swap(volatile unsigned long *ptr,
return val;
}
-void __cpuinit leon_cpu_pre_starting(void *arg)
+void leon_cpu_pre_starting(void *arg)
{
leon_configure_cache_smp();
}
-void __cpuinit leon_cpu_pre_online(void *arg)
+void leon_cpu_pre_online(void *arg)
{
int cpuid = hard_smp_processor_id();
@@ -106,7 +106,7 @@ void __cpuinit leon_cpu_pre_online(void *arg)
extern struct linux_prom_registers smp_penguin_ctable;
-void __cpuinit leon_configure_cache_smp(void)
+void leon_configure_cache_smp(void)
{
unsigned long cfg = sparc_leon3_get_dcachecfg();
int me = smp_processor_id();
@@ -186,7 +186,7 @@ void __init leon_boot_cpus(void)
}
-int __cpuinit leon_boot_one_cpu(int i, struct task_struct *idle)
+int leon_boot_one_cpu(int i, struct task_struct *idle)
{
int timeout;
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 831c001..b90bf23 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -571,9 +571,7 @@ static void __init report_platform_properties(void)
mdesc_release(hp);
}
-static void __cpuinit fill_in_one_cache(cpuinfo_sparc *c,
- struct mdesc_handle *hp,
- u64 mp)
+static void fill_in_one_cache(cpuinfo_sparc *c, struct mdesc_handle *hp, u64 mp)
{
const u64 *level = mdesc_get_property(hp, mp, "level", NULL);
const u64 *size = mdesc_get_property(hp, mp, "size", NULL);
@@ -616,7 +614,7 @@ static void __cpuinit fill_in_one_cache(cpuinfo_sparc *c,
}
}
-static void __cpuinit mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id)
+static void mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id)
{
u64 a;
@@ -649,7 +647,7 @@ static void __cpuinit mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id
}
}
-static void __cpuinit set_core_ids(struct mdesc_handle *hp)
+static void set_core_ids(struct mdesc_handle *hp)
{
int idx;
u64 mp;
@@ -674,7 +672,7 @@ static void __cpuinit set_core_ids(struct mdesc_handle *hp)
}
}
-static void __cpuinit mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id)
+static void mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id)
{
u64 a;
@@ -693,7 +691,7 @@ static void __cpuinit mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id
}
}
-static void __cpuinit __set_proc_ids(struct mdesc_handle *hp, const char *exec_unit_name)
+static void __set_proc_ids(struct mdesc_handle *hp, const char *exec_unit_name)
{
int idx;
u64 mp;
@@ -714,14 +712,14 @@ static void __cpuinit __set_proc_ids(struct mdesc_handle *hp, const char *exec_u
}
}
-static void __cpuinit set_proc_ids(struct mdesc_handle *hp)
+static void set_proc_ids(struct mdesc_handle *hp)
{
__set_proc_ids(hp, "exec_unit");
__set_proc_ids(hp, "exec-unit");
}
-static void __cpuinit get_one_mondo_bits(const u64 *p, unsigned int *mask,
- unsigned long def, unsigned long max)
+static void get_one_mondo_bits(const u64 *p, unsigned int *mask,
+ unsigned long def, unsigned long max)
{
u64 val;
@@ -742,8 +740,8 @@ use_default:
*mask = ((1U << def) * 64U) - 1U;
}
-static void __cpuinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
- struct trap_per_cpu *tb)
+static void get_mondo_data(struct mdesc_handle *hp, u64 mp,
+ struct trap_per_cpu *tb)
{
static int printed;
const u64 *val;
@@ -769,7 +767,7 @@ static void __cpuinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
}
}
-static void * __cpuinit mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handle *, u64, int, void *), void *arg, cpumask_t *mask)
+static void *mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handle *, u64, int, void *), void *arg, cpumask_t *mask)
{
struct mdesc_handle *hp = mdesc_grab();
void *ret = NULL;
@@ -799,7 +797,8 @@ out:
return ret;
}
-static void * __cpuinit record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid, void *arg)
+static void *record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid,
+ void *arg)
{
ncpus_probed++;
#ifdef CONFIG_SMP
@@ -808,7 +807,7 @@ static void * __cpuinit record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpui
return NULL;
}
-void __cpuinit mdesc_populate_present_mask(cpumask_t *mask)
+void mdesc_populate_present_mask(cpumask_t *mask)
{
if (tlb_type != hypervisor)
return;
@@ -841,7 +840,8 @@ void __init mdesc_get_page_sizes(cpumask_t *mask, unsigned long *pgsz_mask)
mdesc_iterate_over_cpus(check_one_pgsz, pgsz_mask, mask);
}
-static void * __cpuinit fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid, void *arg)
+static void *fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid,
+ void *arg)
{
const u64 *cfreq = mdesc_get_property(hp, mp, "clock-frequency", NULL);
struct trap_per_cpu *tb;
@@ -890,7 +890,7 @@ static void * __cpuinit fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpu
return NULL;
}
-void __cpuinit mdesc_fill_in_cpu_data(cpumask_t *mask)
+void mdesc_fill_in_cpu_data(cpumask_t *mask)
{
struct mdesc_handle *hp;
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index e3f2b81..a102bfb 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -39,7 +39,7 @@
#include "kernel.h"
#include "irq.h"
-volatile unsigned long cpu_callin_map[NR_CPUS] __cpuinitdata = {0,};
+volatile unsigned long cpu_callin_map[NR_CPUS] = {0,};
cpumask_t smp_commenced_mask = CPU_MASK_NONE;
@@ -53,7 +53,7 @@ const struct sparc32_ipi_ops *sparc32_ipi_ops;
* instruction which is much better...
*/
-void __cpuinit smp_store_cpu_info(int id)
+void smp_store_cpu_info(int id)
{
int cpu_node;
int mid;
@@ -120,7 +120,7 @@ void cpu_panic(void)
panic("SMP bolixed\n");
}
-struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 };
+struct linux_prom_registers smp_penguin_ctable = { 0 };
void smp_send_reschedule(int cpu)
{
@@ -259,10 +259,10 @@ void __init smp_prepare_boot_cpu(void)
set_cpu_possible(cpuid, true);
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
- extern int __cpuinit smp4m_boot_one_cpu(int, struct task_struct *);
- extern int __cpuinit smp4d_boot_one_cpu(int, struct task_struct *);
+ extern int smp4m_boot_one_cpu(int, struct task_struct *);
+ extern int smp4d_boot_one_cpu(int, struct task_struct *);
int ret=0;
switch(sparc_cpu_model) {
@@ -297,7 +297,7 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
return ret;
}
-void __cpuinit arch_cpu_pre_starting(void *arg)
+void arch_cpu_pre_starting(void *arg)
{
local_ops->cache_all();
local_ops->tlb_all();
@@ -317,7 +317,7 @@ void __cpuinit arch_cpu_pre_starting(void *arg)
}
}
-void __cpuinit arch_cpu_pre_online(void *arg)
+void arch_cpu_pre_online(void *arg)
{
unsigned int cpuid = hard_smp_processor_id();
@@ -344,7 +344,7 @@ void __cpuinit arch_cpu_pre_online(void *arg)
}
}
-void __cpuinit sparc_start_secondary(void *arg)
+void sparc_start_secondary(void *arg)
{
unsigned int cpu;
@@ -375,7 +375,7 @@ void __cpuinit sparc_start_secondary(void *arg)
BUG();
}
-void __cpuinit smp_callin(void)
+void smp_callin(void)
{
sparc_start_secondary(NULL);
}
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 77539ed..e142545 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -87,7 +87,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();
@@ -281,7 +281,8 @@ static unsigned long kimage_addr_to_ra(void *p)
return kern_base + (val - KERNBASE);
}
-static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, void **descrp)
+static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg,
+ void **descrp)
{
extern unsigned long sparc64_ttable_tl0;
extern unsigned long kern_locked_tte_data;
@@ -342,7 +343,7 @@ extern unsigned long sparc64_cpu_startup;
*/
static struct thread_info *cpu_new_thread = NULL;
-static int __cpuinit smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle)
+static int smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle)
{
unsigned long entry (unsigned long)(&sparc64_cpu_startup);
@@ -1266,7 +1267,7 @@ void smp_fill_in_sib_core_maps(void)
}
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int ret = smp_boot_one_cpu(cpu, tidle);
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index c9eb82f..d5c3195 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -50,7 +50,7 @@ static inline void show_leds(int cpuid)
"i" (ASI_M_CTL));
}
-void __cpuinit sun4d_cpu_pre_starting(void *arg)
+void sun4d_cpu_pre_starting(void *arg)
{
int cpuid = hard_smp_processor_id();
@@ -62,7 +62,7 @@ void __cpuinit sun4d_cpu_pre_starting(void *arg)
cc_set_imsk((cc_get_imsk() & ~0x8000) | 0x4000);
}
-void __cpuinit sun4d_cpu_pre_online(void *arg)
+void sun4d_cpu_pre_online(void *arg)
{
unsigned long flags;
int cpuid;
@@ -118,7 +118,7 @@ void __init smp4d_boot_cpus(void)
local_ops->cache_all();
}
-int __cpuinit smp4d_boot_one_cpu(int i, struct task_struct *idle)
+int smp4d_boot_one_cpu(int i, struct task_struct *idle)
{
unsigned long *entry = &sun4d_cpu_startup;
int timeout;
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 8a65f15..d3408e7 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -34,11 +34,11 @@ swap_ulong(volatile unsigned long *ptr, unsigned long val)
return val;
}
-void __cpuinit sun4m_cpu_pre_starting(void *arg)
+void sun4m_cpu_pre_starting(void *arg)
{
}
-void __cpuinit sun4m_cpu_pre_online(void *arg)
+void sun4m_cpu_pre_online(void *arg)
{
int cpuid = hard_smp_processor_id();
@@ -75,7 +75,7 @@ void __init smp4m_boot_cpus(void)
local_ops->cache_all();
}
-int __cpuinit smp4m_boot_one_cpu(int i, struct task_struct *idle)
+int smp4m_boot_one_cpu(int i, struct task_struct *idle)
{
unsigned long *entry = &sun4m_cpu_startup;
int timeout;
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 654e8aa..c21c673 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -246,7 +246,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;
@@ -266,7 +266,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,
};
diff --git a/arch/sparc/kernel/trampoline_32.S b/arch/sparc/kernel/trampoline_32.S
index 6cdb08c..76dcbd3 100644
--- a/arch/sparc/kernel/trampoline_32.S
+++ b/arch/sparc/kernel/trampoline_32.S
@@ -18,7 +18,6 @@
.globl sun4m_cpu_startup
.globl sun4d_cpu_startup
- __CPUINIT
.align 4
/* When we start up a cpu for the first time it enters this routine.
@@ -94,7 +93,6 @@ smp_panic:
/* CPUID in bootbus can be found at PA 0xff0140000 */
#define SUN4D_BOOTBUS_CPUID 0xf0140000
- __CPUINIT
.align 4
sun4d_cpu_startup:
@@ -146,7 +144,6 @@ sun4d_cpu_startup:
b,a smp_panic
- __CPUINIT
.align 4
.global leon_smp_cpu_startup, smp_penguin_ctable
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index 2e973a2..e0b1e13 100644
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -32,13 +32,11 @@ itlb_load:
dtlb_load:
.asciz "SUNW,dtlb-load"
- /* XXX __cpuinit this thing XXX */
#define TRAMP_STACK_SIZE 1024
.align 16
tramp_stack:
.skip TRAMP_STACK_SIZE
- __CPUINIT
.align 8
.globl sparc64_cpu_startup, sparc64_cpu_startup_end
sparc64_cpu_startup:
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index a9c42a7..ed82eda 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1694,7 +1694,7 @@ static void __init sun4v_ktsb_init(void)
#endif
}
-void __cpuinit sun4v_ktsb_register(void)
+void sun4v_ktsb_register(void)
{
unsigned long pa, ret;
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 036c279..5d721df 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -858,7 +858,7 @@ static void __init map_kernel(void)
}
}
-void (*poke_srmmu)(void) __cpuinitdata = NULL;
+void (*poke_srmmu)(void) = NULL;
extern unsigned long bootmem_init(unsigned long *pages_avail);
@@ -1055,7 +1055,7 @@ static void __init init_vac_layout(void)
(int)vac_cache_size, (int)vac_line_size);
}
-static void __cpuinit poke_hypersparc(void)
+static void poke_hypersparc(void)
{
volatile unsigned long clear;
unsigned long mreg = srmmu_get_mmureg();
@@ -1107,7 +1107,7 @@ static void __init init_hypersparc(void)
hypersparc_setup_blockops();
}
-static void __cpuinit poke_swift(void)
+static void poke_swift(void)
{
unsigned long mreg;
@@ -1287,7 +1287,7 @@ static void turbosparc_flush_tlb_page(struct vm_area_struct *vma, unsigned long
}
-static void __cpuinit poke_turbosparc(void)
+static void poke_turbosparc(void)
{
unsigned long mreg = srmmu_get_mmureg();
unsigned long ccreg;
@@ -1350,7 +1350,7 @@ static void __init init_turbosparc(void)
poke_srmmu = poke_turbosparc;
}
-static void __cpuinit poke_tsunami(void)
+static void poke_tsunami(void)
{
unsigned long mreg = srmmu_get_mmureg();
@@ -1391,7 +1391,7 @@ static void __init init_tsunami(void)
tsunami_setup_blockops();
}
-static void __cpuinit poke_viking(void)
+static void poke_viking(void)
{
unsigned long mreg = srmmu_get_mmureg();
static int smp_catch;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 08/32] sparc: delete __cpuinit/__CPUINIT usage from all users
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, David S. Miller, sparclinux
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/sparc uses of the __cpuinit macros from
C files and removes __CPUINIT from assembly files. Note that even
though arch/sparc/kernel/trampoline_64.S has instances of ".previous"
in it, they are all paired off against explicit ".section" directives,
and not implicitly paired with __CPUINIT (unlike mips and arm were).
[1] https://lkml.org/lkml/2013/5/20/589
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[I worry - that any trampoline code that was __cpuinit might possibly
end up linked at a different place now. The concern there being that
implicit address expectations now get violated, and silent boot failures
result (as a worst case). Compile tested but not boot tested.]
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/sparc/kernel/ds.c | 11 ++++-------
arch/sparc/kernel/entry.h | 2 +-
arch/sparc/kernel/hvtramp.S | 1 -
arch/sparc/kernel/irq_64.c | 5 +++--
arch/sparc/kernel/leon_smp.c | 10 +++++-----
arch/sparc/kernel/mdesc.c | 34 +++++++++++++++++-----------------
arch/sparc/kernel/smp_32.c | 20 ++++++++++----------
arch/sparc/kernel/smp_64.c | 9 +++++----
arch/sparc/kernel/sun4d_smp.c | 6 +++---
arch/sparc/kernel/sun4m_smp.c | 6 +++---
arch/sparc/kernel/sysfs.c | 4 ++--
arch/sparc/kernel/trampoline_32.S | 3 ---
arch/sparc/kernel/trampoline_64.S | 2 --
arch/sparc/mm/init_64.c | 2 +-
arch/sparc/mm/srmmu.c | 12 ++++++------
15 files changed, 60 insertions(+), 67 deletions(-)
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 5ef48da..92dbf79 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -528,10 +528,8 @@ static void dr_cpu_mark(struct ds_data *resp, int cpu, int ncpus,
}
}
-static int __cpuinit dr_cpu_configure(struct ds_info *dp,
- struct ds_cap_state *cp,
- u64 req_num,
- cpumask_t *mask)
+static int dr_cpu_configure(struct ds_info *dp, struct ds_cap_state *cp,
+ u64 req_num, cpumask_t *mask)
{
struct ds_data *resp;
int resp_len, ncpus, cpu;
@@ -627,9 +625,8 @@ static int dr_cpu_unconfigure(struct ds_info *dp,
return 0;
}
-static void __cpuinit dr_cpu_data(struct ds_info *dp,
- struct ds_cap_state *cp,
- void *buf, int len)
+static void dr_cpu_data(struct ds_info *dp, struct ds_cap_state *cp, void *buf,
+ int len)
{
struct ds_data *data = buf;
struct dr_cpu_tag *tag = (struct dr_cpu_tag *) (data + 1);
diff --git a/arch/sparc/kernel/entry.h b/arch/sparc/kernel/entry.h
index cc3c5cb..9c179fb 100644
--- a/arch/sparc/kernel/entry.h
+++ b/arch/sparc/kernel/entry.h
@@ -250,7 +250,7 @@ extern struct ino_bucket *ivector_table;
extern unsigned long ivector_table_pa;
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 /* CONFIG_SPARC32 */
#endif /* _ENTRY_H */
diff --git a/arch/sparc/kernel/hvtramp.S b/arch/sparc/kernel/hvtramp.S
index 605c960..4eb1a5a 100644
--- a/arch/sparc/kernel/hvtramp.S
+++ b/arch/sparc/kernel/hvtramp.S
@@ -16,7 +16,6 @@
#include <asm/asi.h>
#include <asm/pil.h>
- __CPUINIT
.align 8
.globl hv_cpu_startup, hv_cpu_startup_end
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 9bcbbe2..d4840ce 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -835,7 +835,8 @@ void notrace init_irqwork_curcpu(void)
* Therefore you cannot make any OBP calls, not even prom_printf,
* from these two routines.
*/
-static void __cpuinit notrace register_one_mondo(unsigned long paddr, unsigned long type, unsigned long qmask)
+static void notrace register_one_mondo(unsigned long paddr, unsigned long type,
+ unsigned long qmask)
{
unsigned long num_entries = (qmask + 1) / 64;
unsigned long status;
@@ -848,7 +849,7 @@ static void __cpuinit notrace register_one_mondo(unsigned long paddr, unsigned l
}
}
-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];
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index d7aa524..6edf955 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -54,7 +54,7 @@ extern ctxd_t *srmmu_ctx_table_phys;
static int smp_processors_ready;
extern volatile unsigned long cpu_callin_map[NR_CPUS];
extern cpumask_t smp_commenced_mask;
-void __cpuinit leon_configure_cache_smp(void);
+void leon_configure_cache_smp(void);
static void leon_ipi_init(void);
/* IRQ number of LEON IPIs */
@@ -69,12 +69,12 @@ static inline unsigned long do_swap(volatile unsigned long *ptr,
return val;
}
-void __cpuinit leon_cpu_pre_starting(void *arg)
+void leon_cpu_pre_starting(void *arg)
{
leon_configure_cache_smp();
}
-void __cpuinit leon_cpu_pre_online(void *arg)
+void leon_cpu_pre_online(void *arg)
{
int cpuid = hard_smp_processor_id();
@@ -106,7 +106,7 @@ void __cpuinit leon_cpu_pre_online(void *arg)
extern struct linux_prom_registers smp_penguin_ctable;
-void __cpuinit leon_configure_cache_smp(void)
+void leon_configure_cache_smp(void)
{
unsigned long cfg = sparc_leon3_get_dcachecfg();
int me = smp_processor_id();
@@ -186,7 +186,7 @@ void __init leon_boot_cpus(void)
}
-int __cpuinit leon_boot_one_cpu(int i, struct task_struct *idle)
+int leon_boot_one_cpu(int i, struct task_struct *idle)
{
int timeout;
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 831c001..b90bf23 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -571,9 +571,7 @@ static void __init report_platform_properties(void)
mdesc_release(hp);
}
-static void __cpuinit fill_in_one_cache(cpuinfo_sparc *c,
- struct mdesc_handle *hp,
- u64 mp)
+static void fill_in_one_cache(cpuinfo_sparc *c, struct mdesc_handle *hp, u64 mp)
{
const u64 *level = mdesc_get_property(hp, mp, "level", NULL);
const u64 *size = mdesc_get_property(hp, mp, "size", NULL);
@@ -616,7 +614,7 @@ static void __cpuinit fill_in_one_cache(cpuinfo_sparc *c,
}
}
-static void __cpuinit mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id)
+static void mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id)
{
u64 a;
@@ -649,7 +647,7 @@ static void __cpuinit mark_core_ids(struct mdesc_handle *hp, u64 mp, int core_id
}
}
-static void __cpuinit set_core_ids(struct mdesc_handle *hp)
+static void set_core_ids(struct mdesc_handle *hp)
{
int idx;
u64 mp;
@@ -674,7 +672,7 @@ static void __cpuinit set_core_ids(struct mdesc_handle *hp)
}
}
-static void __cpuinit mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id)
+static void mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id)
{
u64 a;
@@ -693,7 +691,7 @@ static void __cpuinit mark_proc_ids(struct mdesc_handle *hp, u64 mp, int proc_id
}
}
-static void __cpuinit __set_proc_ids(struct mdesc_handle *hp, const char *exec_unit_name)
+static void __set_proc_ids(struct mdesc_handle *hp, const char *exec_unit_name)
{
int idx;
u64 mp;
@@ -714,14 +712,14 @@ static void __cpuinit __set_proc_ids(struct mdesc_handle *hp, const char *exec_u
}
}
-static void __cpuinit set_proc_ids(struct mdesc_handle *hp)
+static void set_proc_ids(struct mdesc_handle *hp)
{
__set_proc_ids(hp, "exec_unit");
__set_proc_ids(hp, "exec-unit");
}
-static void __cpuinit get_one_mondo_bits(const u64 *p, unsigned int *mask,
- unsigned long def, unsigned long max)
+static void get_one_mondo_bits(const u64 *p, unsigned int *mask,
+ unsigned long def, unsigned long max)
{
u64 val;
@@ -742,8 +740,8 @@ use_default:
*mask = ((1U << def) * 64U) - 1U;
}
-static void __cpuinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
- struct trap_per_cpu *tb)
+static void get_mondo_data(struct mdesc_handle *hp, u64 mp,
+ struct trap_per_cpu *tb)
{
static int printed;
const u64 *val;
@@ -769,7 +767,7 @@ static void __cpuinit get_mondo_data(struct mdesc_handle *hp, u64 mp,
}
}
-static void * __cpuinit mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handle *, u64, int, void *), void *arg, cpumask_t *mask)
+static void *mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handle *, u64, int, void *), void *arg, cpumask_t *mask)
{
struct mdesc_handle *hp = mdesc_grab();
void *ret = NULL;
@@ -799,7 +797,8 @@ out:
return ret;
}
-static void * __cpuinit record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid, void *arg)
+static void *record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid,
+ void *arg)
{
ncpus_probed++;
#ifdef CONFIG_SMP
@@ -808,7 +807,7 @@ static void * __cpuinit record_one_cpu(struct mdesc_handle *hp, u64 mp, int cpui
return NULL;
}
-void __cpuinit mdesc_populate_present_mask(cpumask_t *mask)
+void mdesc_populate_present_mask(cpumask_t *mask)
{
if (tlb_type != hypervisor)
return;
@@ -841,7 +840,8 @@ void __init mdesc_get_page_sizes(cpumask_t *mask, unsigned long *pgsz_mask)
mdesc_iterate_over_cpus(check_one_pgsz, pgsz_mask, mask);
}
-static void * __cpuinit fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid, void *arg)
+static void *fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpuid,
+ void *arg)
{
const u64 *cfreq = mdesc_get_property(hp, mp, "clock-frequency", NULL);
struct trap_per_cpu *tb;
@@ -890,7 +890,7 @@ static void * __cpuinit fill_in_one_cpu(struct mdesc_handle *hp, u64 mp, int cpu
return NULL;
}
-void __cpuinit mdesc_fill_in_cpu_data(cpumask_t *mask)
+void mdesc_fill_in_cpu_data(cpumask_t *mask)
{
struct mdesc_handle *hp;
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index e3f2b81..a102bfb 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -39,7 +39,7 @@
#include "kernel.h"
#include "irq.h"
-volatile unsigned long cpu_callin_map[NR_CPUS] __cpuinitdata = {0,};
+volatile unsigned long cpu_callin_map[NR_CPUS] = {0,};
cpumask_t smp_commenced_mask = CPU_MASK_NONE;
@@ -53,7 +53,7 @@ const struct sparc32_ipi_ops *sparc32_ipi_ops;
* instruction which is much better...
*/
-void __cpuinit smp_store_cpu_info(int id)
+void smp_store_cpu_info(int id)
{
int cpu_node;
int mid;
@@ -120,7 +120,7 @@ void cpu_panic(void)
panic("SMP bolixed\n");
}
-struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 };
+struct linux_prom_registers smp_penguin_ctable = { 0 };
void smp_send_reschedule(int cpu)
{
@@ -259,10 +259,10 @@ void __init smp_prepare_boot_cpu(void)
set_cpu_possible(cpuid, true);
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
- extern int __cpuinit smp4m_boot_one_cpu(int, struct task_struct *);
- extern int __cpuinit smp4d_boot_one_cpu(int, struct task_struct *);
+ extern int smp4m_boot_one_cpu(int, struct task_struct *);
+ extern int smp4d_boot_one_cpu(int, struct task_struct *);
int ret=0;
switch(sparc_cpu_model) {
@@ -297,7 +297,7 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
return ret;
}
-void __cpuinit arch_cpu_pre_starting(void *arg)
+void arch_cpu_pre_starting(void *arg)
{
local_ops->cache_all();
local_ops->tlb_all();
@@ -317,7 +317,7 @@ void __cpuinit arch_cpu_pre_starting(void *arg)
}
}
-void __cpuinit arch_cpu_pre_online(void *arg)
+void arch_cpu_pre_online(void *arg)
{
unsigned int cpuid = hard_smp_processor_id();
@@ -344,7 +344,7 @@ void __cpuinit arch_cpu_pre_online(void *arg)
}
}
-void __cpuinit sparc_start_secondary(void *arg)
+void sparc_start_secondary(void *arg)
{
unsigned int cpu;
@@ -375,7 +375,7 @@ void __cpuinit sparc_start_secondary(void *arg)
BUG();
}
-void __cpuinit smp_callin(void)
+void smp_callin(void)
{
sparc_start_secondary(NULL);
}
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 77539ed..e142545 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -87,7 +87,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();
@@ -281,7 +281,8 @@ static unsigned long kimage_addr_to_ra(void *p)
return kern_base + (val - KERNBASE);
}
-static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg, void **descrp)
+static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg,
+ void **descrp)
{
extern unsigned long sparc64_ttable_tl0;
extern unsigned long kern_locked_tte_data;
@@ -342,7 +343,7 @@ extern unsigned long sparc64_cpu_startup;
*/
static struct thread_info *cpu_new_thread = NULL;
-static int __cpuinit smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle)
+static int smp_boot_one_cpu(unsigned int cpu, struct task_struct *idle)
{
unsigned long entry =
(unsigned long)(&sparc64_cpu_startup);
@@ -1266,7 +1267,7 @@ void smp_fill_in_sib_core_maps(void)
}
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int ret = smp_boot_one_cpu(cpu, tidle);
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index c9eb82f..d5c3195 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -50,7 +50,7 @@ static inline void show_leds(int cpuid)
"i" (ASI_M_CTL));
}
-void __cpuinit sun4d_cpu_pre_starting(void *arg)
+void sun4d_cpu_pre_starting(void *arg)
{
int cpuid = hard_smp_processor_id();
@@ -62,7 +62,7 @@ void __cpuinit sun4d_cpu_pre_starting(void *arg)
cc_set_imsk((cc_get_imsk() & ~0x8000) | 0x4000);
}
-void __cpuinit sun4d_cpu_pre_online(void *arg)
+void sun4d_cpu_pre_online(void *arg)
{
unsigned long flags;
int cpuid;
@@ -118,7 +118,7 @@ void __init smp4d_boot_cpus(void)
local_ops->cache_all();
}
-int __cpuinit smp4d_boot_one_cpu(int i, struct task_struct *idle)
+int smp4d_boot_one_cpu(int i, struct task_struct *idle)
{
unsigned long *entry = &sun4d_cpu_startup;
int timeout;
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 8a65f15..d3408e7 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -34,11 +34,11 @@ swap_ulong(volatile unsigned long *ptr, unsigned long val)
return val;
}
-void __cpuinit sun4m_cpu_pre_starting(void *arg)
+void sun4m_cpu_pre_starting(void *arg)
{
}
-void __cpuinit sun4m_cpu_pre_online(void *arg)
+void sun4m_cpu_pre_online(void *arg)
{
int cpuid = hard_smp_processor_id();
@@ -75,7 +75,7 @@ void __init smp4m_boot_cpus(void)
local_ops->cache_all();
}
-int __cpuinit smp4m_boot_one_cpu(int i, struct task_struct *idle)
+int smp4m_boot_one_cpu(int i, struct task_struct *idle)
{
unsigned long *entry = &sun4m_cpu_startup;
int timeout;
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 654e8aa..c21c673 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -246,7 +246,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;
@@ -266,7 +266,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,
};
diff --git a/arch/sparc/kernel/trampoline_32.S b/arch/sparc/kernel/trampoline_32.S
index 6cdb08c..76dcbd3 100644
--- a/arch/sparc/kernel/trampoline_32.S
+++ b/arch/sparc/kernel/trampoline_32.S
@@ -18,7 +18,6 @@
.globl sun4m_cpu_startup
.globl sun4d_cpu_startup
- __CPUINIT
.align 4
/* When we start up a cpu for the first time it enters this routine.
@@ -94,7 +93,6 @@ smp_panic:
/* CPUID in bootbus can be found at PA 0xff0140000 */
#define SUN4D_BOOTBUS_CPUID 0xf0140000
- __CPUINIT
.align 4
sun4d_cpu_startup:
@@ -146,7 +144,6 @@ sun4d_cpu_startup:
b,a smp_panic
- __CPUINIT
.align 4
.global leon_smp_cpu_startup, smp_penguin_ctable
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index 2e973a2..e0b1e13 100644
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -32,13 +32,11 @@ itlb_load:
dtlb_load:
.asciz "SUNW,dtlb-load"
- /* XXX __cpuinit this thing XXX */
#define TRAMP_STACK_SIZE 1024
.align 16
tramp_stack:
.skip TRAMP_STACK_SIZE
- __CPUINIT
.align 8
.globl sparc64_cpu_startup, sparc64_cpu_startup_end
sparc64_cpu_startup:
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index a9c42a7..ed82eda 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -1694,7 +1694,7 @@ static void __init sun4v_ktsb_init(void)
#endif
}
-void __cpuinit sun4v_ktsb_register(void)
+void sun4v_ktsb_register(void)
{
unsigned long pa, ret;
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 036c279..5d721df 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -858,7 +858,7 @@ static void __init map_kernel(void)
}
}
-void (*poke_srmmu)(void) __cpuinitdata = NULL;
+void (*poke_srmmu)(void) = NULL;
extern unsigned long bootmem_init(unsigned long *pages_avail);
@@ -1055,7 +1055,7 @@ static void __init init_vac_layout(void)
(int)vac_cache_size, (int)vac_line_size);
}
-static void __cpuinit poke_hypersparc(void)
+static void poke_hypersparc(void)
{
volatile unsigned long clear;
unsigned long mreg = srmmu_get_mmureg();
@@ -1107,7 +1107,7 @@ static void __init init_hypersparc(void)
hypersparc_setup_blockops();
}
-static void __cpuinit poke_swift(void)
+static void poke_swift(void)
{
unsigned long mreg;
@@ -1287,7 +1287,7 @@ static void turbosparc_flush_tlb_page(struct vm_area_struct *vma, unsigned long
}
-static void __cpuinit poke_turbosparc(void)
+static void poke_turbosparc(void)
{
unsigned long mreg = srmmu_get_mmureg();
unsigned long ccreg;
@@ -1350,7 +1350,7 @@ static void __init init_turbosparc(void)
poke_srmmu = poke_turbosparc;
}
-static void __cpuinit poke_tsunami(void)
+static void poke_tsunami(void)
{
unsigned long mreg = srmmu_get_mmureg();
@@ -1391,7 +1391,7 @@ static void __init init_tsunami(void)
tsunami_setup_blockops();
}
-static void __cpuinit poke_viking(void)
+static void poke_viking(void)
{
unsigned long mreg = srmmu_get_mmureg();
static int smp_catch;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 09/32] arm64: delete __cpuinit usage from all users
2013-06-24 19:30 ` Paul Gortmaker
` (11 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-25 8:45 ` Catalin Marinas
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Catalin Marinas, Will Deacon
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/arm64 uses of the __cpuinit macros from
all C files. Currently arm64 does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/arm64/include/asm/arch_timer.h | 2 +-
arch/arm64/kernel/debug-monitors.c | 6 +++---
arch/arm64/kernel/hw_breakpoint.c | 4 ++--
arch/arm64/kernel/smp.c | 8 ++++----
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index d56ed11..98abd47 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -97,7 +97,7 @@ static inline u32 arch_timer_get_cntfrq(void)
return val;
}
-static inline void __cpuinit arch_counter_set_user_access(void)
+static inline void arch_counter_set_user_access(void)
{
u32 cntkctl;
diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
index 08018e3..cbfacf7 100644
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -141,7 +141,7 @@ static void clear_os_lock(void *unused)
isb();
}
-static int __cpuinit os_lock_notify(struct notifier_block *self,
+static int os_lock_notify(struct notifier_block *self,
unsigned long action, void *data)
{
int cpu = (unsigned long)data;
@@ -150,11 +150,11 @@ static int __cpuinit os_lock_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata os_lock_nb = {
+static struct notifier_block os_lock_nb = {
.notifier_call = os_lock_notify,
};
-static int __cpuinit debug_monitors_init(void)
+static int debug_monitors_init(void)
{
/* Clear the OS lock. */
smp_call_function(clear_os_lock, NULL, 1);
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
index 5ab825c..329218c 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -821,7 +821,7 @@ static void reset_ctrl_regs(void *unused)
}
}
-static int __cpuinit hw_breakpoint_reset_notify(struct notifier_block *self,
+static int hw_breakpoint_reset_notify(struct notifier_block *self,
unsigned long action,
void *hcpu)
{
@@ -831,7 +831,7 @@ static int __cpuinit hw_breakpoint_reset_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata hw_breakpoint_reset_nb = {
+static struct notifier_block hw_breakpoint_reset_nb = {
.notifier_call = hw_breakpoint_reset_notify,
};
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 5d54e37..4a053b3 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -71,7 +71,7 @@ static DEFINE_RAW_SPINLOCK(boot_lock);
* in coherency or not. This is necessary for the hotplug code to work
* reliably.
*/
-static void __cpuinit write_pen_release(u64 val)
+static void write_pen_release(u64 val)
{
void *start = (void *)&secondary_holding_pen_release;
unsigned long size = sizeof(secondary_holding_pen_release);
@@ -84,7 +84,7 @@ static void __cpuinit write_pen_release(u64 val)
* Boot a secondary CPU, and assign it the specified idle task.
* This also gives us the initial stack to use for this CPU.
*/
-static int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
+static int boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
@@ -122,7 +122,7 @@ static int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
static DECLARE_COMPLETION(cpu_running);
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
int ret;
@@ -162,7 +162,7 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
* 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();
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 09/32] arm64: delete __cpuinit usage from all users
2013-06-24 19:30 ` [PATCH 09/32] arm64: delete __cpuinit " Paul Gortmaker
@ 2013-06-25 8:45 ` Catalin Marinas
0 siblings, 0 replies; 88+ messages in thread
From: Catalin Marinas @ 2013-06-25 8:45 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel@vger.kernel.org, Will Deacon
On Mon, Jun 24, 2013 at 08:30:14PM +0100, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/arm64 uses of the __cpuinit macros from
> all C files. Currently arm64 does not have any __CPUINIT used in
> assembly files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 10/32] arc: delete __cpuinit usage from all arc files
2013-06-24 19:30 ` Paul Gortmaker
` (12 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-25 4:37 ` Vineet Gupta
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Vineet Gupta
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/arc uses of the __cpuinit macros from
all C files. Currently arc does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/arc/include/asm/irq.h | 2 +-
arch/arc/kernel/irq.c | 2 +-
arch/arc/kernel/setup.c | 10 +++++-----
arch/arc/kernel/smp.c | 4 ++--
arch/arc/kernel/time.c | 6 +++---
arch/arc/mm/cache_arc700.c | 4 ++--
arch/arc/mm/tlb.c | 4 ++--
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arc/include/asm/irq.h b/arch/arc/include/asm/irq.h
index 57898a1..c0a7210 100644
--- a/arch/arc/include/asm/irq.h
+++ b/arch/arc/include/asm/irq.h
@@ -21,6 +21,6 @@
extern void __init arc_init_IRQ(void);
extern int __init get_hw_config_num_irq(void);
-void __cpuinit arc_local_timer_setup(unsigned int cpu);
+void arc_local_timer_setup(unsigned int cpu);
#endif
diff --git a/arch/arc/kernel/irq.c b/arch/arc/kernel/irq.c
index 4918a66..305b3f8 100644
--- a/arch/arc/kernel/irq.c
+++ b/arch/arc/kernel/irq.c
@@ -28,7 +28,7 @@
* -Disable all IRQs (on CPU side)
* -Optionally, setup the High priority Interrupts as Level 2 IRQs
*/
-void __cpuinit arc_init_IRQ(void)
+void arc_init_IRQ(void)
{
int level_mask = 0;
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 5b6ee41..6b08345 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -31,14 +31,14 @@
int running_on_hw = 1; /* vs. on ISS */
char __initdata command_line[COMMAND_LINE_SIZE];
-struct machine_desc *machine_desc __cpuinitdata;
+struct machine_desc *machine_desc;
struct task_struct *_current_task[NR_CPUS]; /* For stack switching */
struct cpuinfo_arc cpuinfo_arc700[NR_CPUS];
-void __cpuinit read_arc_build_cfg_regs(void)
+void read_arc_build_cfg_regs(void)
{
struct bcr_perip uncached_space;
struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
@@ -237,7 +237,7 @@ char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
return buf;
}
-void __cpuinit arc_chk_ccms(void)
+void arc_chk_ccms(void)
{
#if defined(CONFIG_ARC_HAS_DCCM) || defined(CONFIG_ARC_HAS_ICCM)
struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
@@ -272,7 +272,7 @@ void __cpuinit arc_chk_ccms(void)
* hardware has dedicated regs which need to be saved/restored on ctx-sw
* (Single Precision uses core regs), thus kernel is kind of oblivious to it
*/
-void __cpuinit arc_chk_fpu(void)
+void arc_chk_fpu(void)
{
struct cpuinfo_arc *cpu = &cpuinfo_arc700[smp_processor_id()];
@@ -293,7 +293,7 @@ void __cpuinit arc_chk_fpu(void)
* such as only for boot CPU etc
*/
-void __cpuinit setup_processor(void)
+void setup_processor(void)
{
char str[512];
int cpu_id = smp_processor_id();
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index 5c7fd60..bca3052 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -117,7 +117,7 @@ const char *arc_platform_smp_cpuinfo(void)
* Called from asm stub in head.S
* "current"/R25 already setup by low level boot code
*/
-void __cpuinit start_kernel_secondary(void)
+void start_kernel_secondary(void)
{
struct mm_struct *mm = &init_mm;
unsigned int cpu = smp_processor_id();
@@ -154,7 +154,7 @@ void __cpuinit start_kernel_secondary(void)
*
* Essential requirements being where to run from (PC) and stack (SP)
*/
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
unsigned long wait_till;
diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c
index 32afa54..0e51e69 100644
--- a/arch/arc/kernel/time.c
+++ b/arch/arc/kernel/time.c
@@ -61,7 +61,7 @@
#ifdef CONFIG_ARC_HAS_RTSC
-int __cpuinit arc_counter_setup(void)
+int arc_counter_setup(void)
{
/* RTSC insn taps into cpu clk, needs no setup */
@@ -116,7 +116,7 @@ static bool is_usable_as_clocksource(void)
/*
* set 32bit TIMER1 to keep counting monotonically and wraparound
*/
-int __cpuinit arc_counter_setup(void)
+int arc_counter_setup(void)
{
write_aux_reg(ARC_REG_TIMER1_LIMIT, ARC_TIMER_MAX);
write_aux_reg(ARC_REG_TIMER1_CNT, 0);
@@ -223,7 +223,7 @@ static struct irqaction arc_timer_irq = {
* Setup the local event timer for @cpu
* N.B. weak so that some exotic ARC SoCs can completely override it
*/
-void __attribute__((weak)) __cpuinit arc_local_timer_setup(unsigned int cpu)
+void __attribute__((weak)) arc_local_timer_setup(unsigned int cpu)
{
struct clock_event_device *clk = &per_cpu(arc_clockevent_device, cpu);
diff --git a/arch/arc/mm/cache_arc700.c b/arch/arc/mm/cache_arc700.c
index 66c75ee..f415d85 100644
--- a/arch/arc/mm/cache_arc700.c
+++ b/arch/arc/mm/cache_arc700.c
@@ -129,7 +129,7 @@ char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len)
* the cpuinfo structure for later use.
* No Validation done here, simply read/convert the BCRs
*/
-void __cpuinit read_decode_cache_bcr(void)
+void read_decode_cache_bcr(void)
{
struct cpuinfo_arc_cache *p_ic, *p_dc;
unsigned int cpu = smp_processor_id();
@@ -167,7 +167,7 @@ void __cpuinit read_decode_cache_bcr(void)
* 3. Enable the Caches, setup default flush mode for D-Cache
* 3. Calculate the SHMLBA used by user space
*/
-void __cpuinit arc_cache_init(void)
+void arc_cache_init(void)
{
unsigned int cpu = smp_processor_id();
struct cpuinfo_arc_cache *ic = &cpuinfo_arc700[cpu].icache;
diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c
index d44ae33..7957dc4 100644
--- a/arch/arc/mm/tlb.c
+++ b/arch/arc/mm/tlb.c
@@ -469,7 +469,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long vaddr_unaligned,
* the cpuinfo structure for later use.
* No Validation is done here, simply read/convert the BCRs
*/
-void __cpuinit read_decode_mmu_bcr(void)
+void read_decode_mmu_bcr(void)
{
struct cpuinfo_arc_mmu *mmu = &cpuinfo_arc700[smp_processor_id()].mmu;
unsigned int tmp;
@@ -530,7 +530,7 @@ char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len)
return buf;
}
-void __cpuinit arc_mmu_init(void)
+void arc_mmu_init(void)
{
char str[256];
struct cpuinfo_arc_mmu *mmu = &cpuinfo_arc700[smp_processor_id()].mmu;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 10/32] arc: delete __cpuinit usage from all arc files
2013-06-24 19:30 ` [PATCH 10/32] arc: delete __cpuinit usage from all arc files Paul Gortmaker
@ 2013-06-25 4:37 ` Vineet Gupta
0 siblings, 0 replies; 88+ messages in thread
From: Vineet Gupta @ 2013-06-25 4:37 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel
On 06/25/2013 01:00 AM, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/arc uses of the __cpuinit macros from
> all C files. Currently arc does not have any __CPUINIT used in
> assembly files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Applied to ARC for-curr (for 3.11)
Thx a bunch,
-Vineet
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 11/32] blackfin: delete __cpuinit usage from all blackfin files
2013-06-24 19:30 ` Paul Gortmaker
` (13 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-24 22:40 ` Mike Frysinger
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Mike Frysinger, Bob Liu, Sonic Zhang,
uclinux-dist-devel
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/blackfin uses of the __cpuinit macros from
all C files. Currently blackfin does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Cc: uclinux-dist-devel@blackfin.uclinux.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/blackfin/kernel/perf_event.c | 2 +-
arch/blackfin/kernel/setup.c | 4 ++--
arch/blackfin/mach-bf561/smp.c | 6 +++---
arch/blackfin/mach-common/cache-c.c | 4 ++--
arch/blackfin/mach-common/ints-priority.c | 2 +-
arch/blackfin/mach-common/smp.c | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/blackfin/kernel/perf_event.c b/arch/blackfin/kernel/perf_event.c
index e47d19a..974e554 100644
--- a/arch/blackfin/kernel/perf_event.c
+++ b/arch/blackfin/kernel/perf_event.c
@@ -468,7 +468,7 @@ static void bfin_pmu_setup(int cpu)
memset(cpuhw, 0, sizeof(struct cpu_hw_events));
}
-static int __cpuinit
+static int
bfin_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 107b306..19ad063 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -99,7 +99,7 @@ void __init generate_cplb_tables(void)
}
#endif
-void __cpuinit bfin_setup_caches(unsigned int cpu)
+void bfin_setup_caches(unsigned int cpu)
{
#ifdef CONFIG_BFIN_ICACHE
bfin_icache_init(icplb_tbl[cpu]);
@@ -165,7 +165,7 @@ void __cpuinit bfin_setup_caches(unsigned int cpu)
#endif
}
-void __cpuinit bfin_setup_cpudata(unsigned int cpu)
+void bfin_setup_cpudata(unsigned int cpu)
{
struct blackfin_cpudata *cpudata = &per_cpu(cpu_data, cpu);
diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c
index ab1c617..7748b84 100644
--- a/arch/blackfin/mach-bf561/smp.c
+++ b/arch/blackfin/mach-bf561/smp.c
@@ -48,7 +48,7 @@ int __init setup_profiling_timer(unsigned int multiplier) /* not supported */
return -EINVAL;
}
-void __cpuinit platform_secondary_init(unsigned int cpu)
+void platform_secondary_init(unsigned int cpu)
{
/* Clone setup for peripheral interrupt sources from CoreA. */
bfin_write_SICB_IMASK0(bfin_read_SIC_IMASK0());
@@ -74,7 +74,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle)
+int platform_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
@@ -155,7 +155,7 @@ void platform_clear_ipi(unsigned int cpu, int irq)
* Setup core B's local core timer.
* In SMP, core timer is used for clock event device.
*/
-void __cpuinit bfin_local_timer_setup(void)
+void bfin_local_timer_setup(void)
{
#if defined(CONFIG_TICKSOURCE_CORETMR)
struct irq_data *data = irq_get_irq_data(IRQ_CORETMR);
diff --git a/arch/blackfin/mach-common/cache-c.c b/arch/blackfin/mach-common/cache-c.c
index a60a24f..0e1e451 100644
--- a/arch/blackfin/mach-common/cache-c.c
+++ b/arch/blackfin/mach-common/cache-c.c
@@ -52,7 +52,7 @@ bfin_cache_init(struct cplb_entry *cplb_tbl, unsigned long cplb_addr,
}
#ifdef CONFIG_BFIN_ICACHE
-void __cpuinit bfin_icache_init(struct cplb_entry *icplb_tbl)
+void bfin_icache_init(struct cplb_entry *icplb_tbl)
{
bfin_cache_init(icplb_tbl, ICPLB_ADDR0, ICPLB_DATA0, IMEM_CONTROL,
(IMC | ENICPLB));
@@ -60,7 +60,7 @@ void __cpuinit bfin_icache_init(struct cplb_entry *icplb_tbl)
#endif
#ifdef CONFIG_BFIN_DCACHE
-void __cpuinit bfin_dcache_init(struct cplb_entry *dcplb_tbl)
+void bfin_dcache_init(struct cplb_entry *dcplb_tbl)
{
/*
* Anomaly notes:
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 6c0c681..d143fd8 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1281,7 +1281,7 @@ static struct irq_chip bfin_gpio_irqchip = {
.irq_set_wake = bfin_gpio_set_wake,
};
-void __cpuinit init_exception_vectors(void)
+void init_exception_vectors(void)
{
/* cannot program in software:
* evt0 - emulation (jtag)
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 1bc2ce6..e7c5d28 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -46,7 +46,7 @@ struct corelock_slot corelock __attribute__ ((__section__(".l2.bss")));
unsigned long blackfin_iflush_l1_entry[NR_CPUS];
#endif
-struct blackfin_initial_pda __cpuinitdata initial_pda_coreb;
+struct blackfin_initial_pda initial_pda_coreb;
enum ipi_message_type {
BFIN_IPI_TIMER,
@@ -249,7 +249,7 @@ void smp_send_stop(void)
return;
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
int ret;
@@ -262,7 +262,7 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
return ret;
}
-static void __cpuinit setup_secondary(unsigned int cpu)
+static void setup_secondary(unsigned int cpu)
{
unsigned long ilat;
@@ -280,7 +280,7 @@ static void __cpuinit setup_secondary(unsigned int cpu)
IMASK_IVG10 | IMASK_IVG9 | IMASK_IVG8 | IMASK_IVG7 | IMASK_IVGHW;
}
-void __cpuinit secondary_start_kernel(void)
+void secondary_start_kernel(void)
{
unsigned int cpu = smp_processor_id();
struct mm_struct *mm = &init_mm;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 12/32] s390: delete __cpuinit usage from all s390 files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Martin Schwidefsky, Heiko Carstens, linux390,
linux-s390
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/s390 uses of the __cpuinit macros from
all C files. Currently s390 does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/s390/kernel/cache.c | 15 +++++++--------
arch/s390/kernel/perf_cpum_cf.c | 4 ++--
arch/s390/kernel/processor.c | 2 +-
arch/s390/kernel/smp.c | 17 ++++++++---------
arch/s390/kernel/sysinfo.c | 2 +-
arch/s390/kernel/vtime.c | 6 +++---
arch/s390/mm/fault.c | 4 ++--
7 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c
index 64b2465..dd62071 100644
--- a/arch/s390/kernel/cache.c
+++ b/arch/s390/kernel/cache.c
@@ -173,7 +173,7 @@ error:
}
}
-static struct cache_dir *__cpuinit cache_create_cache_dir(int cpu)
+static struct cache_dir *cache_create_cache_dir(int cpu)
{
struct cache_dir *cache_dir;
struct kobject *kobj = NULL;
@@ -289,9 +289,8 @@ static struct kobj_type cache_index_type = {
.default_attrs = cache_index_default_attrs,
};
-static int __cpuinit cache_create_index_dir(struct cache_dir *cache_dir,
- struct cache *cache, int index,
- int cpu)
+static int cache_create_index_dir(struct cache_dir *cache_dir,
+ struct cache *cache, int index, int cpu)
{
struct cache_index_dir *index_dir;
int rc;
@@ -313,7 +312,7 @@ out:
return rc;
}
-static int __cpuinit cache_add_cpu(int cpu)
+static int cache_add_cpu(int cpu)
{
struct cache_dir *cache_dir;
struct cache *cache;
@@ -335,7 +334,7 @@ static int __cpuinit cache_add_cpu(int cpu)
return 0;
}
-static void __cpuinit cache_remove_cpu(int cpu)
+static void cache_remove_cpu(int cpu)
{
struct cache_index_dir *index, *next;
struct cache_dir *cache_dir;
@@ -354,8 +353,8 @@ static void __cpuinit cache_remove_cpu(int cpu)
cache_dir_cpu[cpu] = NULL;
}
-static int __cpuinit cache_hotplug(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int cache_hotplug(struct notifier_block *nfb, unsigned long action,
+ void *hcpu)
{
int cpu = (long)hcpu;
int rc = 0;
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 390d9ae..fb99c20 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -639,8 +639,8 @@ static struct pmu cpumf_pmu = {
.cancel_txn = cpumf_pmu_cancel_txn,
};
-static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
unsigned int cpu = (long) hcpu;
int flags;
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 753c41d..2461202 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
/*
* cpu_init - initializes state that is per-CPU.
*/
-void __cpuinit cpu_init(void)
+void cpu_init(void)
{
struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
struct cpuid *id = &__get_cpu_var(cpu_id);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 15a016c..d386c4e 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -165,7 +165,7 @@ static void pcpu_ec_call(struct pcpu *pcpu, int ec_bit)
pcpu_sigp_retry(pcpu, order, 0);
}
-static int __cpuinit pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
+static int pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
{
struct _lowcore *lc;
@@ -616,10 +616,9 @@ static struct sclp_cpu_info *smp_get_cpu_info(void)
return info;
}
-static int __cpuinit smp_add_present_cpu(int cpu);
+static int smp_add_present_cpu(int cpu);
-static int __cpuinit __smp_rescan_cpus(struct sclp_cpu_info *info,
- int sysfs_add)
+static int __smp_rescan_cpus(struct sclp_cpu_info *info, int sysfs_add)
{
struct pcpu *pcpu;
cpumask_t avail;
@@ -685,7 +684,7 @@ static void __init smp_detect_cpus(void)
/*
* Activate a secondary processor.
*/
-static void __cpuinit smp_start_secondary(void *cpuvoid)
+static void smp_start_secondary(void *cpuvoid)
{
S390_lowcore.last_update_clock = get_tod_clock();
S390_lowcore.restart_stack = (unsigned long) restart_stack;
@@ -708,7 +707,7 @@ static void __cpuinit smp_start_secondary(void *cpuvoid)
}
/* Upping and downing of CPUs */
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
struct pcpu *pcpu;
int rc;
@@ -964,8 +963,8 @@ static struct attribute_group cpu_online_attr_group = {
.attrs = cpu_online_attrs,
};
-static int __cpuinit smp_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int smp_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
struct cpu *c = &pcpu_devices[cpu].cpu;
@@ -983,7 +982,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
return notifier_from_errno(err);
}
-static int __cpuinit smp_add_present_cpu(int cpu)
+static int smp_add_present_cpu(int cpu)
{
struct cpu *c = &pcpu_devices[cpu].cpu;
struct device *s = &c->dev;
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index 62f89d9..811f542 100644
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -418,7 +418,7 @@ void s390_adjust_jiffies(void)
/*
* calibrate the delay loop
*/
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
s390_adjust_jiffies();
/* Print the good old Bogomips line .. */
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 3fb0935..9b9c1b7 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -371,14 +371,14 @@ EXPORT_SYMBOL(del_virt_timer);
/*
* Start the virtual CPU timer on the current CPU.
*/
-void __cpuinit init_cpu_vtimer(void)
+void init_cpu_vtimer(void)
{
/* set initial cpu timer */
set_vtimer(VTIMER_MAX_SLICE);
}
-static int __cpuinit s390_nohz_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int s390_nohz_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
struct s390_idle_data *idle;
long cpu = (long) hcpu;
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 047c3e4..f00aefb 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -639,8 +639,8 @@ out:
put_task_struct(tsk);
}
-static int __cpuinit pfault_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int pfault_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
struct thread_struct *thread, *next;
struct task_struct *tsk;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 12/32] s390: delete __cpuinit usage from all s390 files
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Martin Schwidefsky, Heiko Carstens, linux390,
linux-s390
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/s390 uses of the __cpuinit macros from
all C files. Currently s390 does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/s390/kernel/cache.c | 15 +++++++--------
arch/s390/kernel/perf_cpum_cf.c | 4 ++--
arch/s390/kernel/processor.c | 2 +-
arch/s390/kernel/smp.c | 17 ++++++++---------
arch/s390/kernel/sysinfo.c | 2 +-
arch/s390/kernel/vtime.c | 6 +++---
arch/s390/mm/fault.c | 4 ++--
7 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c
index 64b2465..dd62071 100644
--- a/arch/s390/kernel/cache.c
+++ b/arch/s390/kernel/cache.c
@@ -173,7 +173,7 @@ error:
}
}
-static struct cache_dir *__cpuinit cache_create_cache_dir(int cpu)
+static struct cache_dir *cache_create_cache_dir(int cpu)
{
struct cache_dir *cache_dir;
struct kobject *kobj = NULL;
@@ -289,9 +289,8 @@ static struct kobj_type cache_index_type = {
.default_attrs = cache_index_default_attrs,
};
-static int __cpuinit cache_create_index_dir(struct cache_dir *cache_dir,
- struct cache *cache, int index,
- int cpu)
+static int cache_create_index_dir(struct cache_dir *cache_dir,
+ struct cache *cache, int index, int cpu)
{
struct cache_index_dir *index_dir;
int rc;
@@ -313,7 +312,7 @@ out:
return rc;
}
-static int __cpuinit cache_add_cpu(int cpu)
+static int cache_add_cpu(int cpu)
{
struct cache_dir *cache_dir;
struct cache *cache;
@@ -335,7 +334,7 @@ static int __cpuinit cache_add_cpu(int cpu)
return 0;
}
-static void __cpuinit cache_remove_cpu(int cpu)
+static void cache_remove_cpu(int cpu)
{
struct cache_index_dir *index, *next;
struct cache_dir *cache_dir;
@@ -354,8 +353,8 @@ static void __cpuinit cache_remove_cpu(int cpu)
cache_dir_cpu[cpu] = NULL;
}
-static int __cpuinit cache_hotplug(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int cache_hotplug(struct notifier_block *nfb, unsigned long action,
+ void *hcpu)
{
int cpu = (long)hcpu;
int rc = 0;
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index 390d9ae..fb99c20 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -639,8 +639,8 @@ static struct pmu cpumf_pmu = {
.cancel_txn = cpumf_pmu_cancel_txn,
};
-static int __cpuinit cpumf_pmu_notifier(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int cpumf_pmu_notifier(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
unsigned int cpu = (long) hcpu;
int flags;
diff --git a/arch/s390/kernel/processor.c b/arch/s390/kernel/processor.c
index 753c41d..2461202 100644
--- a/arch/s390/kernel/processor.c
+++ b/arch/s390/kernel/processor.c
@@ -21,7 +21,7 @@ static DEFINE_PER_CPU(struct cpuid, cpu_id);
/*
* cpu_init - initializes state that is per-CPU.
*/
-void __cpuinit cpu_init(void)
+void cpu_init(void)
{
struct s390_idle_data *idle = &__get_cpu_var(s390_idle);
struct cpuid *id = &__get_cpu_var(cpu_id);
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 15a016c..d386c4e 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -165,7 +165,7 @@ static void pcpu_ec_call(struct pcpu *pcpu, int ec_bit)
pcpu_sigp_retry(pcpu, order, 0);
}
-static int __cpuinit pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
+static int pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
{
struct _lowcore *lc;
@@ -616,10 +616,9 @@ static struct sclp_cpu_info *smp_get_cpu_info(void)
return info;
}
-static int __cpuinit smp_add_present_cpu(int cpu);
+static int smp_add_present_cpu(int cpu);
-static int __cpuinit __smp_rescan_cpus(struct sclp_cpu_info *info,
- int sysfs_add)
+static int __smp_rescan_cpus(struct sclp_cpu_info *info, int sysfs_add)
{
struct pcpu *pcpu;
cpumask_t avail;
@@ -685,7 +684,7 @@ static void __init smp_detect_cpus(void)
/*
* Activate a secondary processor.
*/
-static void __cpuinit smp_start_secondary(void *cpuvoid)
+static void smp_start_secondary(void *cpuvoid)
{
S390_lowcore.last_update_clock = get_tod_clock();
S390_lowcore.restart_stack = (unsigned long) restart_stack;
@@ -708,7 +707,7 @@ static void __cpuinit smp_start_secondary(void *cpuvoid)
}
/* Upping and downing of CPUs */
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
struct pcpu *pcpu;
int rc;
@@ -964,8 +963,8 @@ static struct attribute_group cpu_online_attr_group = {
.attrs = cpu_online_attrs,
};
-static int __cpuinit smp_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int smp_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
unsigned int cpu = (unsigned int)(long)hcpu;
struct cpu *c = &pcpu_devices[cpu].cpu;
@@ -983,7 +982,7 @@ static int __cpuinit smp_cpu_notify(struct notifier_block *self,
return notifier_from_errno(err);
}
-static int __cpuinit smp_add_present_cpu(int cpu)
+static int smp_add_present_cpu(int cpu)
{
struct cpu *c = &pcpu_devices[cpu].cpu;
struct device *s = &c->dev;
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index 62f89d9..811f542 100644
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -418,7 +418,7 @@ void s390_adjust_jiffies(void)
/*
* calibrate the delay loop
*/
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
s390_adjust_jiffies();
/* Print the good old Bogomips line .. */
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 3fb0935..9b9c1b7 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -371,14 +371,14 @@ EXPORT_SYMBOL(del_virt_timer);
/*
* Start the virtual CPU timer on the current CPU.
*/
-void __cpuinit init_cpu_vtimer(void)
+void init_cpu_vtimer(void)
{
/* set initial cpu timer */
set_vtimer(VTIMER_MAX_SLICE);
}
-static int __cpuinit s390_nohz_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int s390_nohz_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
struct s390_idle_data *idle;
long cpu = (long) hcpu;
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 047c3e4..f00aefb 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -639,8 +639,8 @@ out:
put_task_struct(tsk);
}
-static int __cpuinit pfault_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int pfault_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
struct thread_struct *thread, *next;
struct task_struct *tsk;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 13/32] sh: delete __cpuinit usage from all sh files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Paul Mundt, linux-sh
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/sh uses of the __cpuinit macros from
all C files. Currently sh does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/sh/kernel/cpu/init.c | 18 +++++++++---------
arch/sh/kernel/cpu/sh2/probe.c | 2 +-
arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
arch/sh/kernel/cpu/sh3/probe.c | 2 +-
arch/sh/kernel/cpu/sh4/probe.c | 2 +-
arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +++---
arch/sh/kernel/cpu/sh5/probe.c | 2 +-
arch/sh/kernel/perf_event.c | 4 ++--
arch/sh/kernel/process.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh/kernel/smp.c | 8 ++++----
arch/sh/kernel/traps_32.c | 2 +-
arch/sh/kernel/traps_64.c | 2 +-
arch/sh/mm/tlb-sh5.c | 2 +-
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 61a07da..ecf83cd 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -43,9 +43,9 @@
* peripherals (nofpu, nodsp, and so forth).
*/
#define onchip_setup(x) \
-static int x##_disabled __cpuinitdata = !cpu_has_##x; \
+static int x##_disabled = !cpu_has_##x; \
\
-static int __cpuinit x##_setup(char *opts) \
+static int x##_setup(char *opts) \
{ \
x##_disabled = 1; \
return 1; \
@@ -59,7 +59,7 @@ onchip_setup(dsp);
#define CPUOPM 0xff2f0000
#define CPUOPM_RABD (1 << 5)
-static void __cpuinit speculative_execution_init(void)
+static void speculative_execution_init(void)
{
/* Clear RABD */
__raw_writel(__raw_readl(CPUOPM) & ~CPUOPM_RABD, CPUOPM);
@@ -78,7 +78,7 @@ static void __cpuinit speculative_execution_init(void)
#define EXPMASK_BRDSSLP (1 << 1)
#define EXPMASK_MMCAW (1 << 4)
-static void __cpuinit expmask_init(void)
+static void expmask_init(void)
{
unsigned long expmask = __raw_readl(EXPMASK);
@@ -217,7 +217,7 @@ static void detect_cache_shape(void)
l2_cache_shape = -1; /* No S-cache */
}
-static void __cpuinit fpu_init(void)
+static void fpu_init(void)
{
/* Disable the FPU */
if (fpu_disabled && (current_cpu_data.flags & CPU_HAS_FPU)) {
@@ -230,7 +230,7 @@ static void __cpuinit fpu_init(void)
}
#ifdef CONFIG_SH_DSP
-static void __cpuinit release_dsp(void)
+static void release_dsp(void)
{
unsigned long sr;
@@ -244,7 +244,7 @@ static void __cpuinit release_dsp(void)
);
}
-static void __cpuinit dsp_init(void)
+static void dsp_init(void)
{
unsigned long sr;
@@ -276,7 +276,7 @@ static void __cpuinit dsp_init(void)
release_dsp();
}
#else
-static inline void __cpuinit dsp_init(void) { }
+static inline void dsp_init(void) { }
#endif /* CONFIG_SH_DSP */
/**
@@ -295,7 +295,7 @@ static inline void __cpuinit dsp_init(void) { }
* Each processor family is still responsible for doing its own probing
* and cache configuration in cpu_probe().
*/
-asmlinkage void __cpuinit cpu_init(void)
+asmlinkage void cpu_init(void)
{
current_thread_info()->cpu = hard_smp_processor_id();
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index bab8e75..6c687ae 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -13,7 +13,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
#if defined(CONFIG_CPU_SUBTYPE_SH7619)
boot_cpu_data.type = CPU_SH7619;
diff --git a/arch/sh/kernel/cpu/sh2a/probe.c b/arch/sh/kernel/cpu/sh2a/probe.c
index 5170b6a..3f87971 100644
--- a/arch/sh/kernel/cpu/sh2a/probe.c
+++ b/arch/sh/kernel/cpu/sh2a/probe.c
@@ -13,7 +13,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
boot_cpu_data.family = CPU_FAMILY_SH2A;
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index bf23c32..426e1e1 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -16,7 +16,7 @@
#include <asm/cache.h>
#include <asm/io.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
unsigned long addr0, addr1, data0, data1, data2, data3;
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 0fbbd50..a521bcf 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -15,7 +15,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
unsigned long pvr, prr, cvr;
unsigned long size;
diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index 03f2b55..4a29880 100644
--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -124,7 +124,7 @@ static void shx3_update_boot_vector(unsigned int cpu)
__raw_writel(STBCR_RESET, STBCR_REG(cpu));
}
-static int __cpuinit
+static int
shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)hcpu;
@@ -143,11 +143,11 @@ shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata shx3_cpu_notifier = {
+static struct notifier_block shx3_cpu_notifier = {
.notifier_call = shx3_cpu_callback,
};
-static int __cpuinit register_shx3_cpu_notifier(void)
+static int register_shx3_cpu_notifier(void)
{
register_hotcpu_notifier(&shx3_cpu_notifier);
return 0;
diff --git a/arch/sh/kernel/cpu/sh5/probe.c b/arch/sh/kernel/cpu/sh5/probe.c
index 9e88240..eca427c 100644
--- a/arch/sh/kernel/cpu/sh5/probe.c
+++ b/arch/sh/kernel/cpu/sh5/probe.c
@@ -17,7 +17,7 @@
#include <asm/cache.h>
#include <asm/tlb.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
unsigned long long cir;
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c
index 068b8a2..b9cefeb 100644
--- a/arch/sh/kernel/perf_event.c
+++ b/arch/sh/kernel/perf_event.c
@@ -367,7 +367,7 @@ static void sh_pmu_setup(int cpu)
memset(cpuhw, 0, sizeof(struct cpu_hw_events));
}
-static int __cpuinit
+static int
sh_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
@@ -384,7 +384,7 @@ sh_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-int __cpuinit register_sh_pmu(struct sh_pmu *_pmu)
+int register_sh_pmu(struct sh_pmu *_pmu)
{
if (sh_pmu)
return -EBUSY;
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 055d91b..53bc6c4 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -65,7 +65,7 @@ void arch_task_cache_init(void)
# define HAVE_SOFTFP 0
#endif
-void __cpuinit init_thread_xstate(void)
+void init_thread_xstate(void)
{
if (boot_cpu_data.flags & CPU_HAS_FPU)
xstate_size = sizeof(struct sh_fpu_hard_struct);
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index ebe7a7d..1cf90e9 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -172,7 +172,7 @@ disable:
#endif
}
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
struct clk *clk = clk_get(NULL, "cpu_clk");
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 4569645..86a7936 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -37,7 +37,7 @@ struct plat_smp_ops *mp_ops = NULL;
/* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 };
-void __cpuinit 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");
@@ -45,7 +45,7 @@ void __cpuinit register_smp_ops(struct plat_smp_ops *ops)
mp_ops = ops;
}
-static inline void __cpuinit smp_store_cpu_info(unsigned int cpu)
+static inline void smp_store_cpu_info(unsigned int cpu)
{
struct sh_cpuinfo *c = cpu_data + cpu;
@@ -174,7 +174,7 @@ void native_play_dead(void)
}
#endif
-asmlinkage void __cpuinit start_secondary(void)
+asmlinkage void start_secondary(void)
{
unsigned int cpu = smp_processor_id();
struct mm_struct *mm = &init_mm;
@@ -215,7 +215,7 @@ extern struct {
void *thread_info;
} stack_start;
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tsk)
+int __cpu_up(unsigned int cpu, struct task_struct *tsk)
{
unsigned long timeout;
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 5f513a6..68e99f0 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -741,7 +741,7 @@ asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
die_if_kernel("exception", regs, ex);
}
-void __cpuinit per_cpu_trap_init(void)
+void per_cpu_trap_init(void)
{
extern void *vbr_base;
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index f87d20d..112ea11 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -810,7 +810,7 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs)
poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);
}
-void __cpuinit per_cpu_trap_init(void)
+void per_cpu_trap_init(void)
{
/* Nothing to do for now, VBR initialization later. */
}
diff --git a/arch/sh/mm/tlb-sh5.c b/arch/sh/mm/tlb-sh5.c
index ff1c40a..e4bb2a8 100644
--- a/arch/sh/mm/tlb-sh5.c
+++ b/arch/sh/mm/tlb-sh5.c
@@ -17,7 +17,7 @@
/**
* sh64_tlb_init - Perform initial setup for the DTLB and ITLB.
*/
-int __cpuinit sh64_tlb_init(void)
+int sh64_tlb_init(void)
{
/* Assign some sane DTLB defaults */
cpu_data->dtlb.entries = 64;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 13/32] sh: delete __cpuinit usage from all sh files
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Paul Mundt, linux-sh
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/sh uses of the __cpuinit macros from
all C files. Currently sh does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/sh/kernel/cpu/init.c | 18 +++++++++---------
arch/sh/kernel/cpu/sh2/probe.c | 2 +-
arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
arch/sh/kernel/cpu/sh3/probe.c | 2 +-
arch/sh/kernel/cpu/sh4/probe.c | 2 +-
arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +++---
arch/sh/kernel/cpu/sh5/probe.c | 2 +-
arch/sh/kernel/perf_event.c | 4 ++--
arch/sh/kernel/process.c | 2 +-
arch/sh/kernel/setup.c | 2 +-
arch/sh/kernel/smp.c | 8 ++++----
arch/sh/kernel/traps_32.c | 2 +-
arch/sh/kernel/traps_64.c | 2 +-
arch/sh/mm/tlb-sh5.c | 2 +-
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/sh/kernel/cpu/init.c b/arch/sh/kernel/cpu/init.c
index 61a07da..ecf83cd 100644
--- a/arch/sh/kernel/cpu/init.c
+++ b/arch/sh/kernel/cpu/init.c
@@ -43,9 +43,9 @@
* peripherals (nofpu, nodsp, and so forth).
*/
#define onchip_setup(x) \
-static int x##_disabled __cpuinitdata = !cpu_has_##x; \
+static int x##_disabled = !cpu_has_##x; \
\
-static int __cpuinit x##_setup(char *opts) \
+static int x##_setup(char *opts) \
{ \
x##_disabled = 1; \
return 1; \
@@ -59,7 +59,7 @@ onchip_setup(dsp);
#define CPUOPM 0xff2f0000
#define CPUOPM_RABD (1 << 5)
-static void __cpuinit speculative_execution_init(void)
+static void speculative_execution_init(void)
{
/* Clear RABD */
__raw_writel(__raw_readl(CPUOPM) & ~CPUOPM_RABD, CPUOPM);
@@ -78,7 +78,7 @@ static void __cpuinit speculative_execution_init(void)
#define EXPMASK_BRDSSLP (1 << 1)
#define EXPMASK_MMCAW (1 << 4)
-static void __cpuinit expmask_init(void)
+static void expmask_init(void)
{
unsigned long expmask = __raw_readl(EXPMASK);
@@ -217,7 +217,7 @@ static void detect_cache_shape(void)
l2_cache_shape = -1; /* No S-cache */
}
-static void __cpuinit fpu_init(void)
+static void fpu_init(void)
{
/* Disable the FPU */
if (fpu_disabled && (current_cpu_data.flags & CPU_HAS_FPU)) {
@@ -230,7 +230,7 @@ static void __cpuinit fpu_init(void)
}
#ifdef CONFIG_SH_DSP
-static void __cpuinit release_dsp(void)
+static void release_dsp(void)
{
unsigned long sr;
@@ -244,7 +244,7 @@ static void __cpuinit release_dsp(void)
);
}
-static void __cpuinit dsp_init(void)
+static void dsp_init(void)
{
unsigned long sr;
@@ -276,7 +276,7 @@ static void __cpuinit dsp_init(void)
release_dsp();
}
#else
-static inline void __cpuinit dsp_init(void) { }
+static inline void dsp_init(void) { }
#endif /* CONFIG_SH_DSP */
/**
@@ -295,7 +295,7 @@ static inline void __cpuinit dsp_init(void) { }
* Each processor family is still responsible for doing its own probing
* and cache configuration in cpu_probe().
*/
-asmlinkage void __cpuinit cpu_init(void)
+asmlinkage void cpu_init(void)
{
current_thread_info()->cpu = hard_smp_processor_id();
diff --git a/arch/sh/kernel/cpu/sh2/probe.c b/arch/sh/kernel/cpu/sh2/probe.c
index bab8e75..6c687ae 100644
--- a/arch/sh/kernel/cpu/sh2/probe.c
+++ b/arch/sh/kernel/cpu/sh2/probe.c
@@ -13,7 +13,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
#if defined(CONFIG_CPU_SUBTYPE_SH7619)
boot_cpu_data.type = CPU_SH7619;
diff --git a/arch/sh/kernel/cpu/sh2a/probe.c b/arch/sh/kernel/cpu/sh2a/probe.c
index 5170b6a..3f87971 100644
--- a/arch/sh/kernel/cpu/sh2a/probe.c
+++ b/arch/sh/kernel/cpu/sh2a/probe.c
@@ -13,7 +13,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
boot_cpu_data.family = CPU_FAMILY_SH2A;
diff --git a/arch/sh/kernel/cpu/sh3/probe.c b/arch/sh/kernel/cpu/sh3/probe.c
index bf23c32..426e1e1 100644
--- a/arch/sh/kernel/cpu/sh3/probe.c
+++ b/arch/sh/kernel/cpu/sh3/probe.c
@@ -16,7 +16,7 @@
#include <asm/cache.h>
#include <asm/io.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
unsigned long addr0, addr1, data0, data1, data2, data3;
diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 0fbbd50..a521bcf 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -15,7 +15,7 @@
#include <asm/processor.h>
#include <asm/cache.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
unsigned long pvr, prr, cvr;
unsigned long size;
diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index 03f2b55..4a29880 100644
--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -124,7 +124,7 @@ static void shx3_update_boot_vector(unsigned int cpu)
__raw_writel(STBCR_RESET, STBCR_REG(cpu));
}
-static int __cpuinit
+static int
shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned int)hcpu;
@@ -143,11 +143,11 @@ shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata shx3_cpu_notifier = {
+static struct notifier_block shx3_cpu_notifier = {
.notifier_call = shx3_cpu_callback,
};
-static int __cpuinit register_shx3_cpu_notifier(void)
+static int register_shx3_cpu_notifier(void)
{
register_hotcpu_notifier(&shx3_cpu_notifier);
return 0;
diff --git a/arch/sh/kernel/cpu/sh5/probe.c b/arch/sh/kernel/cpu/sh5/probe.c
index 9e88240..eca427c 100644
--- a/arch/sh/kernel/cpu/sh5/probe.c
+++ b/arch/sh/kernel/cpu/sh5/probe.c
@@ -17,7 +17,7 @@
#include <asm/cache.h>
#include <asm/tlb.h>
-void __cpuinit cpu_probe(void)
+void cpu_probe(void)
{
unsigned long long cir;
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c
index 068b8a2..b9cefeb 100644
--- a/arch/sh/kernel/perf_event.c
+++ b/arch/sh/kernel/perf_event.c
@@ -367,7 +367,7 @@ static void sh_pmu_setup(int cpu)
memset(cpuhw, 0, sizeof(struct cpu_hw_events));
}
-static int __cpuinit
+static int
sh_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
@@ -384,7 +384,7 @@ sh_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-int __cpuinit register_sh_pmu(struct sh_pmu *_pmu)
+int register_sh_pmu(struct sh_pmu *_pmu)
{
if (sh_pmu)
return -EBUSY;
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index 055d91b..53bc6c4 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -65,7 +65,7 @@ void arch_task_cache_init(void)
# define HAVE_SOFTFP 0
#endif
-void __cpuinit init_thread_xstate(void)
+void init_thread_xstate(void)
{
if (boot_cpu_data.flags & CPU_HAS_FPU)
xstate_size = sizeof(struct sh_fpu_hard_struct);
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index ebe7a7d..1cf90e9 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -172,7 +172,7 @@ disable:
#endif
}
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
struct clk *clk = clk_get(NULL, "cpu_clk");
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 4569645..86a7936 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -37,7 +37,7 @@ struct plat_smp_ops *mp_ops = NULL;
/* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 };
-void __cpuinit 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");
@@ -45,7 +45,7 @@ void __cpuinit register_smp_ops(struct plat_smp_ops *ops)
mp_ops = ops;
}
-static inline void __cpuinit smp_store_cpu_info(unsigned int cpu)
+static inline void smp_store_cpu_info(unsigned int cpu)
{
struct sh_cpuinfo *c = cpu_data + cpu;
@@ -174,7 +174,7 @@ void native_play_dead(void)
}
#endif
-asmlinkage void __cpuinit start_secondary(void)
+asmlinkage void start_secondary(void)
{
unsigned int cpu = smp_processor_id();
struct mm_struct *mm = &init_mm;
@@ -215,7 +215,7 @@ extern struct {
void *thread_info;
} stack_start;
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tsk)
+int __cpu_up(unsigned int cpu, struct task_struct *tsk)
{
unsigned long timeout;
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 5f513a6..68e99f0 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -741,7 +741,7 @@ asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
die_if_kernel("exception", regs, ex);
}
-void __cpuinit per_cpu_trap_init(void)
+void per_cpu_trap_init(void)
{
extern void *vbr_base;
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index f87d20d..112ea11 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -810,7 +810,7 @@ asmlinkage void do_debug_interrupt(unsigned long code, struct pt_regs *regs)
poke_real_address_q(DM_EXP_CAUSE_PHY, 0x0);
}
-void __cpuinit per_cpu_trap_init(void)
+void per_cpu_trap_init(void)
{
/* Nothing to do for now, VBR initialization later. */
}
diff --git a/arch/sh/mm/tlb-sh5.c b/arch/sh/mm/tlb-sh5.c
index ff1c40a..e4bb2a8 100644
--- a/arch/sh/mm/tlb-sh5.c
+++ b/arch/sh/mm/tlb-sh5.c
@@ -17,7 +17,7 @@
/**
* sh64_tlb_init - Perform initial setup for the DTLB and ITLB.
*/
-int __cpuinit sh64_tlb_init(void)
+int sh64_tlb_init(void)
{
/* Assign some sane DTLB defaults */
cpu_data->dtlb.entries = 64;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 14/32] tile: delete __cpuinit usage from all tile files
2013-06-24 19:30 ` Paul Gortmaker
` (16 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Chris Metcalf
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/tile uses of the __cpuinit macros from
all C files. Currently tile does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/tile/kernel/irq.c | 2 +-
arch/tile/kernel/messaging.c | 2 +-
arch/tile/kernel/setup.c | 12 ++++++------
arch/tile/kernel/smpboot.c | 8 ++++----
arch/tile/kernel/time.c | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index 02e6280..3ccf2cd 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -220,7 +220,7 @@ void __init init_IRQ(void)
ipi_init();
}
-void __cpuinit setup_irq_regs(void)
+void setup_irq_regs(void)
{
/* Enable interrupt delivery. */
unmask_irqs(~0UL);
diff --git a/arch/tile/kernel/messaging.c b/arch/tile/kernel/messaging.c
index 0858ee6..00331af 100644
--- a/arch/tile/kernel/messaging.c
+++ b/arch/tile/kernel/messaging.c
@@ -25,7 +25,7 @@
/* All messages are stored here */
static DEFINE_PER_CPU(HV_MsgState, msg_state);
-void __cpuinit init_messaging(void)
+void init_messaging(void)
{
/* Allocate storage for messages in kernel space */
HV_MsgState *state = &__get_cpu_var(msg_state);
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 68b5426..eceb834 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -58,8 +58,8 @@ struct pglist_data node_data[MAX_NUMNODES] __read_mostly;
EXPORT_SYMBOL(node_data);
/* Information on the NUMA nodes that we compute early */
-unsigned long __cpuinitdata node_start_pfn[MAX_NUMNODES];
-unsigned long __cpuinitdata node_end_pfn[MAX_NUMNODES];
+unsigned long node_start_pfn[MAX_NUMNODES];
+unsigned long node_end_pfn[MAX_NUMNODES];
unsigned long __initdata node_memmap_pfn[MAX_NUMNODES];
unsigned long __initdata node_percpu_pfn[MAX_NUMNODES];
unsigned long __initdata node_free_pfn[MAX_NUMNODES];
@@ -84,7 +84,7 @@ unsigned long __initdata boot_pc = (unsigned long)start_kernel;
#ifdef CONFIG_HIGHMEM
/* Page frame index of end of lowmem on each controller. */
-unsigned long __cpuinitdata node_lowmem_end_pfn[MAX_NUMNODES];
+unsigned long node_lowmem_end_pfn[MAX_NUMNODES];
/* Number of pages that can be mapped into lowmem. */
static unsigned long __initdata mappable_physpages;
@@ -290,7 +290,7 @@ static void *__init setup_pa_va_mapping(void)
* This is up to 4 mappings for lowmem, one mapping per memory
* controller, plus one for our text segment.
*/
-static void __cpuinit store_permanent_mappings(void)
+static void store_permanent_mappings(void)
{
int i;
@@ -935,7 +935,7 @@ subsys_initcall(topology_init);
* So the values we set up here in the hypervisor may be overridden on
* the boot cpu as arguments are parsed.
*/
-static __cpuinit void init_super_pages(void)
+static void init_super_pages(void)
{
#ifdef CONFIG_HUGETLB_SUPER_PAGES
int i;
@@ -950,7 +950,7 @@ static __cpuinit void init_super_pages(void)
*
* Called from setup_arch() on the boot cpu, or online_secondary().
*/
-void __cpuinit setup_cpu(int boot)
+void setup_cpu(int boot)
{
/* The boot cpu sets up its permanent mappings much earlier. */
if (!boot)
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 44bab29..a535655 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -133,14 +133,14 @@ static __init int reset_init_affinity(void)
}
late_initcall(reset_init_affinity);
-static struct cpumask cpu_started __cpuinitdata;
+static struct cpumask cpu_started;
/*
* Activate a secondary processor. Very minimal; don't add anything
* to this path without knowing what you're doing, since SMP booting
* is pretty fragile.
*/
-static void __cpuinit start_secondary(void)
+static void start_secondary(void)
{
int cpuid = smp_processor_id();
@@ -183,7 +183,7 @@ static void __cpuinit start_secondary(void)
/*
* Bring a secondary processor online.
*/
-void __cpuinit online_secondary(void)
+void online_secondary(void)
{
/*
* low-memory mappings have been cleared, flush them from
@@ -210,7 +210,7 @@ void __cpuinit online_secondary(void)
cpu_startup_entry(CPUHP_ONLINE);
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
/* Wait 5s total for all CPUs for them to come online */
static int timeout;
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 5ac397e..7c353d8 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -159,7 +159,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
.set_mode = tile_timer_set_mode,
};
-void __cpuinit setup_tile_timer(void)
+void setup_tile_timer(void)
{
struct clock_event_device *evt = &__get_cpu_var(tile_timer);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 15/32] metag: delete __cpuinit usage from all metag files
2013-06-24 19:30 ` Paul Gortmaker
` (17 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-25 15:10 ` James Hogan
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, James Hogan
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/metag uses of the __cpuinit macros from
all C files. Currently metag does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/metag/kernel/perf/perf_event.c | 6 +++---
arch/metag/kernel/smp.c | 16 +++++++---------
arch/metag/kernel/traps.c | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c
index 5b18888..1f4d48f 100644
--- a/arch/metag/kernel/perf/perf_event.c
+++ b/arch/metag/kernel/perf/perf_event.c
@@ -813,8 +813,8 @@ static struct metag_pmu _metag_pmu = {
};
/* PMU CPU hotplug notifier */
-static int __cpuinit metag_pmu_cpu_notify(struct notifier_block *b,
- unsigned long action, void *hcpu)
+static int metag_pmu_cpu_notify(struct notifier_block *b, unsigned long action,
+ void *hcpu)
{
unsigned int cpu = (unsigned int)hcpu;
struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);
@@ -828,7 +828,7 @@ static int __cpuinit metag_pmu_cpu_notify(struct notifier_block *b,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata metag_pmu_notifier = {
+static struct notifier_block metag_pmu_notifier = {
.notifier_call = metag_pmu_cpu_notify,
};
diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c
index f443ec9..f202833 100644
--- a/arch/metag/kernel/smp.c
+++ b/arch/metag/kernel/smp.c
@@ -65,7 +65,7 @@ static DEFINE_SPINLOCK(boot_lock);
/*
* "thread" is assumed to be a valid Meta hardware thread ID.
*/
-int __cpuinit boot_secondary(unsigned int thread, struct task_struct *idle)
+int boot_secondary(unsigned int thread, struct task_struct *idle)
{
u32 val;
@@ -115,11 +115,9 @@ int __cpuinit boot_secondary(unsigned int thread, struct task_struct *idle)
* If the cache partition has changed, prints a message to the log describing
* those changes.
*/
-static __cpuinit void describe_cachepart_change(unsigned int thread,
- const char *label,
- unsigned int sz,
- unsigned int old,
- unsigned int new)
+static void describe_cachepart_change(unsigned int thread, const char *label,
+ unsigned int sz, unsigned int old,
+ unsigned int new)
{
unsigned int lor1, land1, gor1, gand1;
unsigned int lor2, land2, gor2, gand2;
@@ -167,7 +165,7 @@ static __cpuinit void describe_cachepart_change(unsigned int thread,
* Ensures that coherency is enabled and that the threads share the same cache
* partitions.
*/
-static __cpuinit void setup_smp_cache(unsigned int thread)
+static void setup_smp_cache(unsigned int thread)
{
unsigned int this_thread, lflags;
unsigned int dcsz, dcpart_this, dcpart_old, dcpart_new;
@@ -212,7 +210,7 @@ static __cpuinit void setup_smp_cache(unsigned int thread)
icpart_old, icpart_new);
}
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
unsigned int thread = cpu_2_hwthread_id[cpu];
int ret;
@@ -337,7 +335,7 @@ void __cpuexit cpu_die(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_metag *cpu_info = &per_cpu(cpu_data, cpuid);
diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c
index c00ade0..25f9d1c 100644
--- a/arch/metag/kernel/traps.c
+++ b/arch/metag/kernel/traps.c
@@ -812,7 +812,7 @@ static void set_trigger_mask(unsigned int mask)
}
#endif
-void __cpuinit per_cpu_trap_init(unsigned long cpu)
+void per_cpu_trap_init(unsigned long cpu)
{
TBIRES int_context;
unsigned int thread = cpu_2_hwthread_id[cpu];
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 15/32] metag: delete __cpuinit usage from all metag files
2013-06-24 19:30 ` [PATCH 15/32] metag: delete __cpuinit usage from all metag files Paul Gortmaker
@ 2013-06-25 15:10 ` James Hogan
0 siblings, 0 replies; 88+ messages in thread
From: James Hogan @ 2013-06-25 15:10 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel
On 24/06/13 20:30, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/metag uses of the __cpuinit macros from
> all C files. Currently metag does not have any __CPUINIT used in
> assembly files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: James Hogan <james.hogan@imgtec.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: James Hogan <james.hogan@imgtec.com>
Thanks
James
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 16/32] cris: delete __cpuinit usage from all cris files
2013-06-24 19:30 ` Paul Gortmaker
` (18 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-25 10:42 ` Jesper Nilsson
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Mikael Starvik, Jesper Nilsson, linux-cris-kernel
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/cris uses of the __cpuinit macros from
all C files. Currently cris does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: linux-cris-kernel@axis.com
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/cris/arch-v32/kernel/smp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index cdd1202..fe8e603 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -197,7 +197,7 @@ int setup_profiling_timer(unsigned int multiplier)
*/
unsigned long cache_decay_ticks = 1;
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
{
smp_boot_one_cpu(cpu, tidle);
return cpu_online(cpu) ? 0 : -ENOSYS;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 16/32] cris: delete __cpuinit usage from all cris files
2013-06-24 19:30 ` [PATCH 16/32] cris: delete __cpuinit usage from all cris files Paul Gortmaker
@ 2013-06-25 10:42 ` Jesper Nilsson
0 siblings, 0 replies; 88+ messages in thread
From: Jesper Nilsson @ 2013-06-25 10:42 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel@vger.kernel.org, Mikael Starvik, Jesper Nilsson,
linux-cris-kernel
On Mon, Jun 24, 2013 at 09:30:21PM +0200, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/cris uses of the __cpuinit macros from
> all C files. Currently cris does not have any __CPUINIT used in
> assembly files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Mikael Starvik <starvik@axis.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: linux-cris-kernel@axis.com
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
> index cdd1202..fe8e603 100644
> --- a/arch/cris/arch-v32/kernel/smp.c
> +++ b/arch/cris/arch-v32/kernel/smp.c
> @@ -197,7 +197,7 @@ int setup_profiling_timer(unsigned int multiplier)
> */
> unsigned long cache_decay_ticks = 1;
>
> -int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
> +int __cpu_up(unsigned int cpu, struct task_struct *tidle)
> {
> smp_boot_one_cpu(cpu, tidle);
> return cpu_online(cpu) ? 0 : -ENOSYS;
> --
> 1.8.1.2
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 17/32] frv: delete __cpuinit usage from all frv files
2013-06-24 19:30 ` Paul Gortmaker
` (19 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, David Howells
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/frv uses of the __cpuinit macros from
all C files. Currently frv does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/frv/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index ae3a670..9f3a7a6 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -709,7 +709,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);
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 18/32] hexagon: delete __cpuinit usage from all hexagon files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Richard Kuo, linux-hexagon
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/hexagon uses of the __cpuinit macros from
all C files. Currently hexagon does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: linux-hexagon@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/hexagon/kernel/setup.c | 2 +-
arch/hexagon/kernel/smp.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c
index bfe1331..29d1f1b 100644
--- a/arch/hexagon/kernel/setup.c
+++ b/arch/hexagon/kernel/setup.c
@@ -41,7 +41,7 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
int on_simulator;
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
loops_per_jiffy = thread_freq_mhz * 1000000 / HZ;
}
diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c
index 0e364ca..9faaa94 100644
--- a/arch/hexagon/kernel/smp.c
+++ b/arch/hexagon/kernel/smp.c
@@ -146,7 +146,7 @@ void __init smp_prepare_boot_cpu(void)
* to point to current thread info
*/
-void __cpuinit start_secondary(void)
+void start_secondary(void)
{
unsigned int cpu;
unsigned long thread_ptr;
@@ -194,7 +194,7 @@ void __cpuinit start_secondary(void)
* maintains control until "cpu_online(cpu)" is set.
*/
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
struct thread_info *thread = (struct thread_info *)idle->stack;
void *stack_start;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 18/32] hexagon: delete __cpuinit usage from all hexagon files
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Richard Kuo, linux-hexagon
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/hexagon uses of the __cpuinit macros from
all C files. Currently hexagon does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: linux-hexagon@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/hexagon/kernel/setup.c | 2 +-
arch/hexagon/kernel/smp.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c
index bfe1331..29d1f1b 100644
--- a/arch/hexagon/kernel/setup.c
+++ b/arch/hexagon/kernel/setup.c
@@ -41,7 +41,7 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
int on_simulator;
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
loops_per_jiffy = thread_freq_mhz * 1000000 / HZ;
}
diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c
index 0e364ca..9faaa94 100644
--- a/arch/hexagon/kernel/smp.c
+++ b/arch/hexagon/kernel/smp.c
@@ -146,7 +146,7 @@ void __init smp_prepare_boot_cpu(void)
* to point to current thread info
*/
-void __cpuinit start_secondary(void)
+void start_secondary(void)
{
unsigned int cpu;
unsigned long thread_ptr;
@@ -194,7 +194,7 @@ void __cpuinit start_secondary(void)
* maintains control until "cpu_online(cpu)" is set.
*/
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
+int __cpu_up(unsigned int cpu, struct task_struct *idle)
{
struct thread_info *thread = (struct thread_info *)idle->stack;
void *stack_start;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 18/32] hexagon: delete __cpuinit usage from all hexagon files
2013-06-24 19:30 ` Paul Gortmaker
(?)
@ 2013-07-08 17:01 ` Richard Kuo
-1 siblings, 0 replies; 88+ messages in thread
From: Richard Kuo @ 2013-07-08 17:01 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, linux-hexagon
On 06/24/2013 02:30 PM, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/hexagon uses of the __cpuinit macros from
> all C files. Currently hexagon does not have any __CPUINIT used in
> assembly files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: linux-hexagon@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/hexagon/kernel/setup.c b/arch/hexagon/kernel/setup.c
> index bfe1331..29d1f1b 100644
> --- a/arch/hexagon/kernel/setup.c
> +++ b/arch/hexagon/kernel/setup.c
> @@ -41,7 +41,7 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
>
> int on_simulator;
>
> -void __cpuinit calibrate_delay(void)
> +void calibrate_delay(void)
> {
> loops_per_jiffy = thread_freq_mhz * 1000000 / HZ;
> }
> diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c
> index 0e364ca..9faaa94 100644
> --- a/arch/hexagon/kernel/smp.c
> +++ b/arch/hexagon/kernel/smp.c
> @@ -146,7 +146,7 @@ void __init smp_prepare_boot_cpu(void)
> * to point to current thread info
> */
>
> -void __cpuinit start_secondary(void)
> +void start_secondary(void)
> {
> unsigned int cpu;
> unsigned long thread_ptr;
> @@ -194,7 +194,7 @@ void __cpuinit start_secondary(void)
> * maintains control until "cpu_online(cpu)" is set.
> */
>
> -int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
> +int __cpu_up(unsigned int cpu, struct task_struct *idle)
> {
> struct thread_info *thread = (struct thread_info *)idle->stack;
> void *stack_start;
Acked-by: Richard Kuo <rkuo@codeaurora.org>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 19/32] m32r: delete __cpuinit usage from all m32r files
2013-06-24 19:30 ` Paul Gortmaker
` (21 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Hirokazu Takata, linux-m32r, linux-m32r-ja
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/m32r uses of the __cpuinit macros from
all C files. Currently m32r does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: linux-m32r@ml.linux-m32r.org
Cc: linux-m32r-ja@ml.linux-m32r.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/m32r/kernel/smpboot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 0ac558a..bb21f4f 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -343,7 +343,7 @@ static void __init do_boot_cpu(int phys_id)
}
}
-int __cpuinit __cpu_up(unsigned int cpu_id, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu_id, struct task_struct *tidle)
{
int timeout;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 20/32] openrisc: delete __cpuinit usage from all openrisc files
2013-06-24 19:30 ` Paul Gortmaker
` (22 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Jonas Bonn, linux
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/openrisc uses of the __cpuinit macros from
all C files. Currently openrisc does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Jonas Bonn <jonas@southpole.se>
Cc: linux@lists.openrisc.net
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/openrisc/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index f4d5bed..d7359ff 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -267,7 +267,7 @@ void __init detect_unit_config(unsigned long upr, unsigned long mask,
*
*/
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
const int *val;
struct device_node *cpu = NULL;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 21/32] xtensa: delete __cpuinit usage from all xtensa files
2013-06-24 19:30 ` Paul Gortmaker
` (23 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Chris Zankel, Max Filippov, linux-xtensa
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/xtensa uses of the __cpuinit macros from
all C files. Currently xtensa does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/xtensa/kernel/time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index ffb4741..f1818db 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -109,7 +109,7 @@ again:
}
#ifndef CONFIG_GENERIC_CALIBRATE_DELAY
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
loops_per_jiffy = CCOUNT_PER_JIFFY;
printk("Calibrating delay loop (skipped)... "
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 22/32] score: delete __cpuinit usage from all score files
2013-06-24 19:30 ` Paul Gortmaker
` (24 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Chen Liqin, Lennox Wu
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/score uses of the __cpuinit macros from
all C files. Currently score does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/score/mm/tlb-score.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/score/mm/tlb-score.c b/arch/score/mm/tlb-score.c
index 6fdb1002..0040737 100644
--- a/arch/score/mm/tlb-score.c
+++ b/arch/score/mm/tlb-score.c
@@ -240,7 +240,7 @@ void __update_tlb(struct vm_area_struct *vma, unsigned long address, pte_t pte)
local_irq_restore(flags);
}
-void __cpuinit tlb_init(void)
+void tlb_init(void)
{
tlblock_set(0);
local_flush_tlb_all();
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 23/32] x86: delete __cpuinit usage from all x86 files
2013-06-24 19:30 ` Paul Gortmaker
` (25 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-24 19:37 ` Ingo Molnar
` (2 more replies)
-1 siblings, 3 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
arch/x86/include/asm/cpu.h | 2 +-
arch/x86/include/asm/microcode.h | 4 +-
arch/x86/include/asm/microcode_intel.h | 4 +-
arch/x86/include/asm/mmconfig.h | 4 +-
arch/x86/include/asm/mpspec.h | 2 +-
arch/x86/include/asm/numa.h | 6 +--
arch/x86/include/asm/prom.h | 2 +-
arch/x86/include/asm/smp.h | 2 +-
arch/x86/kernel/acpi/boot.c | 6 +--
arch/x86/kernel/apic/apic.c | 30 ++++++-------
arch/x86/kernel/apic/apic_numachip.c | 2 +-
arch/x86/kernel/apic/es7000_32.c | 2 +-
arch/x86/kernel/apic/numaq_32.c | 2 +-
arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
arch/x86/kernel/cpu/amd.c | 33 +++++++-------
arch/x86/kernel/cpu/centaur.c | 26 +++++------
arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
arch/x86/kernel/cpu/hypervisor.c | 2 +-
arch/x86/kernel/cpu/intel.c | 30 ++++++-------
arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
arch/x86/kernel/cpu/perf_event.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
arch/x86/kernel/cpu/rdrand.c | 2 +-
arch/x86/kernel/cpu/scattered.c | 4 +-
arch/x86/kernel/cpu/topology.c | 2 +-
arch/x86/kernel/cpu/transmeta.c | 6 +--
arch/x86/kernel/cpu/umc.c | 2 +-
arch/x86/kernel/cpu/vmware.c | 2 +-
arch/x86/kernel/cpuid.c | 7 ++-
arch/x86/kernel/devicetree.c | 2 +-
arch/x86/kernel/head_32.S | 1 -
arch/x86/kernel/i387.c | 8 ++--
arch/x86/kernel/irq_32.c | 2 +-
arch/x86/kernel/kvm.c | 10 ++---
arch/x86/kernel/kvmclock.c | 2 +-
arch/x86/kernel/microcode_core.c | 2 +-
arch/x86/kernel/microcode_core_early.c | 6 +--
arch/x86/kernel/microcode_intel_early.c | 26 +++++------
arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
arch/x86/kernel/msr.c | 6 +--
arch/x86/kernel/process.c | 2 +-
arch/x86/kernel/setup.c | 2 +-
arch/x86/kernel/smpboot.c | 28 ++++++------
arch/x86/kernel/tboot.c | 6 +--
arch/x86/kernel/tsc.c | 4 +-
arch/x86/kernel/tsc_sync.c | 18 ++++----
arch/x86/kernel/vsyscall_64.c | 6 +--
arch/x86/kernel/x86_init.c | 4 +-
arch/x86/kernel/xsave.c | 4 +-
arch/x86/mm/mmio-mod.c | 4 +-
arch/x86/mm/numa.c | 12 ++---
arch/x86/mm/numa_emulation.c | 12 ++---
arch/x86/mm/setup_nx.c | 4 +-
arch/x86/pci/amd_bus.c | 8 ++--
arch/x86/platform/ce4100/ce4100.c | 2 +-
arch/x86/platform/mrst/mrst.c | 4 +-
arch/x86/xen/enlighten.c | 6 +--
arch/x86/xen/setup.c | 6 +--
arch/x86/xen/smp.c | 12 ++---
arch/x86/xen/spinlock.c | 2 +-
arch/x86/xen/xen-ops.h | 2 +-
68 files changed, 337 insertions(+), 348 deletions(-)
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 5f9a124..d2b1298 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -28,7 +28,7 @@ struct x86_cpu {
#ifdef CONFIG_HOTPLUG_CPU
extern int arch_register_cpu(int num);
extern void arch_unregister_cpu(int);
-extern void __cpuinit start_cpu0(void);
+extern void start_cpu0(void);
#ifdef CONFIG_DEBUG_HOTPLUG_CPU0
extern int _debug_hotplug_cpu(int cpu, int action);
#endif
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index 6bc3985..f98bd66 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -60,11 +60,11 @@ static inline void __exit exit_amd_microcode(void) {}
#ifdef CONFIG_MICROCODE_EARLY
#define MAX_UCODE_COUNT 128
extern void __init load_ucode_bsp(void);
-extern void __cpuinit load_ucode_ap(void);
+extern void load_ucode_ap(void);
extern int __init save_microcode_in_initrd(void);
#else
static inline void __init load_ucode_bsp(void) {}
-static inline void __cpuinit load_ucode_ap(void) {}
+static inline void load_ucode_ap(void) {}
static inline int __init save_microcode_in_initrd(void)
{
return 0;
diff --git a/arch/x86/include/asm/microcode_intel.h b/arch/x86/include/asm/microcode_intel.h
index 87a0853..9067166 100644
--- a/arch/x86/include/asm/microcode_intel.h
+++ b/arch/x86/include/asm/microcode_intel.h
@@ -65,12 +65,12 @@ update_match_revision(struct microcode_header_intel *mc_header, int rev);
#ifdef CONFIG_MICROCODE_INTEL_EARLY
extern void __init load_ucode_intel_bsp(void);
-extern void __cpuinit load_ucode_intel_ap(void);
+extern void load_ucode_intel_ap(void);
extern void show_ucode_info_early(void);
extern int __init save_microcode_in_initrd_intel(void);
#else
static inline __init void load_ucode_intel_bsp(void) {}
-static inline __cpuinit void load_ucode_intel_ap(void) {}
+static inline void load_ucode_intel_ap(void) {}
static inline void show_ucode_info_early(void) {}
static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; }
#endif
diff --git a/arch/x86/include/asm/mmconfig.h b/arch/x86/include/asm/mmconfig.h
index 9b119da..04a3fed 100644
--- a/arch/x86/include/asm/mmconfig.h
+++ b/arch/x86/include/asm/mmconfig.h
@@ -2,8 +2,8 @@
#define _ASM_X86_MMCONFIG_H
#ifdef CONFIG_PCI_MMCONFIG
-extern void __cpuinit fam10h_check_enable_mmcfg(void);
-extern void __cpuinit check_enable_amd_mmconf_dmi(void);
+extern void fam10h_check_enable_mmcfg(void);
+extern void check_enable_amd_mmconf_dmi(void);
#else
static inline void fam10h_check_enable_mmcfg(void) { }
static inline void check_enable_amd_mmconf_dmi(void) { }
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 3e2f42a..626cf70 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -94,7 +94,7 @@ static inline void early_reserve_e820_mpc_new(void) { }
#define default_get_smp_config x86_init_uint_noop
#endif
-void __cpuinit generic_processor_info(int apicid, int version);
+void generic_processor_info(int apicid, int version);
#ifdef CONFIG_ACPI
extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);
extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h
index 1b99ee5..4064aca 100644
--- a/arch/x86/include/asm/numa.h
+++ b/arch/x86/include/asm/numa.h
@@ -39,7 +39,7 @@ static inline void set_apicid_to_node(int apicid, s16 node)
__apicid_to_node[apicid] = node;
}
-extern int __cpuinit numa_cpu_node(int cpu);
+extern int numa_cpu_node(int cpu);
#else /* CONFIG_NUMA */
static inline void set_apicid_to_node(int apicid, s16 node)
@@ -60,8 +60,8 @@ static inline int numa_cpu_node(int cpu)
extern void numa_set_node(int cpu, int node);
extern void numa_clear_node(int cpu);
extern void __init init_cpu_to_node(void);
-extern void __cpuinit numa_add_cpu(int cpu);
-extern void __cpuinit numa_remove_cpu(int cpu);
+extern void numa_add_cpu(int cpu);
+extern void numa_remove_cpu(int cpu);
#else /* CONFIG_NUMA */
static inline void numa_set_node(int cpu, int node) { }
static inline void numa_clear_node(int cpu) { }
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 60bef66..bade6ac 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -27,7 +27,7 @@ extern int of_ioapic;
extern u64 initial_dtb;
extern void add_dtb(u64 data);
extern void x86_add_irq_domains(void);
-void __cpuinit x86_of_pci_init(void);
+void x86_of_pci_init(void);
void x86_dtb_init(void);
#else
static inline void add_dtb(u64 data) { }
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index b073aae..4137890 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -179,7 +179,7 @@ static inline int wbinvd_on_all_cpus(void)
}
#endif /* CONFIG_SMP */
-extern unsigned disabled_cpus __cpuinitdata;
+extern unsigned disabled_cpus;
#ifdef CONFIG_X86_32_SMP
/*
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d81a972..2627a81 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -195,7 +195,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;
@@ -607,7 +607,7 @@ void __init acpi_set_irq_model_ioapic(void)
#ifdef CONFIG_ACPI_HOTPLUG_CPU
#include <acpi/processor.h>
-static void __cpuinit acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
+static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
{
#ifdef CONFIG_ACPI_NUMA
int nid;
@@ -620,7 +620,7 @@ static void __cpuinit acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
#endif
}
-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;
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 1600b1c..c40eee8 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -57,7 +57,7 @@
unsigned int num_processors;
-unsigned disabled_cpus __cpuinitdata;
+unsigned disabled_cpus;
/* Processor that is doing the boot up */
unsigned int boot_cpu_physical_apicid = -1U;
@@ -543,7 +543,7 @@ static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
* Setup the local APIC timer for this CPU. Copy the initialized values
* of the boot CPU and register the clock event in the framework.
*/
-static void __cpuinit setup_APIC_timer(void)
+static void setup_APIC_timer(void)
{
struct clock_event_device *levt = &__get_cpu_var(lapic_events);
@@ -865,7 +865,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();
}
@@ -1210,7 +1210,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 int oldvalue, value, maxlvt;
@@ -1257,7 +1257,7 @@ static void __cpuinit lapic_setup_esr(void)
* Used to setup local APIC while initializing BSP or bringin up APs.
* Always called with preemption disabled.
*/
-void __cpuinit setup_local_APIC(void)
+void setup_local_APIC(void)
{
int cpu = smp_processor_id();
unsigned int value, queued;
@@ -1452,7 +1452,7 @@ void __cpuinit setup_local_APIC(void)
#endif
}
-void __cpuinit end_local_APIC_setup(void)
+void end_local_APIC_setup(void)
{
lapic_setup_esr();
@@ -2062,7 +2062,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, max = nr_cpu_ids;
bool boot_cpu_detected = physid_isset(boot_cpu_physical_apicid,
@@ -2332,7 +2332,7 @@ static struct syscore_ops lapic_syscore_ops = {
.suspend = lapic_suspend,
};
-static void __cpuinit apic_pm_activate(void)
+static void apic_pm_activate(void)
{
apic_pm_state.active = 1;
}
@@ -2357,7 +2357,7 @@ static void apic_pm_activate(void) { }
#ifdef CONFIG_X86_64
-static int __cpuinit apic_cluster_num(void)
+static int apic_cluster_num(void)
{
int i, clusters, zeros;
unsigned id;
@@ -2402,10 +2402,10 @@ static int __cpuinit apic_cluster_num(void)
return clusters;
}
-static int __cpuinitdata multi_checked;
-static int __cpuinitdata multi;
+static int multi_checked;
+static int multi;
-static int __cpuinit set_multi(const struct dmi_system_id *d)
+static int set_multi(const struct dmi_system_id *d)
{
if (multi)
return 0;
@@ -2414,7 +2414,7 @@ static int __cpuinit set_multi(const struct dmi_system_id *d)
return 0;
}
-static const __cpuinitconst struct dmi_system_id multi_dmi_table[] = {
+static const struct dmi_system_id multi_dmi_table[] = {
{
.callback = set_multi,
.ident = "IBM System Summit2",
@@ -2426,7 +2426,7 @@ static const __cpuinitconst struct dmi_system_id multi_dmi_table[] = {
{}
};
-static void __cpuinit dmi_check_multi(void)
+static void dmi_check_multi(void)
{
if (multi_checked)
return;
@@ -2443,7 +2443,7 @@ static void __cpuinit dmi_check_multi(void)
* multi-chassis.
* Use DMI to check them
*/
-__cpuinit int apic_is_clustered_box(void)
+int apic_is_clustered_box(void)
{
dmi_check_multi();
if (multi)
diff --git a/arch/x86/kernel/apic/apic_numachip.c b/arch/x86/kernel/apic/apic_numachip.c
index 9a91109..3e67f9e 100644
--- a/arch/x86/kernel/apic/apic_numachip.c
+++ b/arch/x86/kernel/apic/apic_numachip.c
@@ -74,7 +74,7 @@ static int numachip_phys_pkg_id(int initial_apic_id, int index_msb)
return initial_apic_id >> index_msb;
}
-static int __cpuinit numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)
+static int numachip_wakeup_secondary(int phys_apicid, unsigned long start_rip)
{
union numachip_csr_g3_ext_irq_gen int_gen;
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 0874799..c552247 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -130,7 +130,7 @@ int es7000_plat;
*/
-static int __cpuinit wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip)
+static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip)
{
unsigned long vect = 0, psaival = 0;
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index d661ee9..1e42e8f 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -105,7 +105,7 @@ static void __init smp_dump_qct(void)
}
}
-void __cpuinit numaq_tsc_disable(void)
+void numaq_tsc_disable(void)
{
if (!found_numaq)
return;
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index c88baa4..140e29d 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -148,7 +148,7 @@ static void init_x2apic_ldr(void)
/*
* At CPU state changes, update the x2apic cluster sibling info.
*/
-static int __cpuinit
+static int
update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int this_cpu = (unsigned long)hcpu;
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 63092af..1191ac1 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -209,7 +209,7 @@ EXPORT_SYMBOL_GPL(uv_possible_blades);
unsigned long sn_rtc_cycles_per_second;
EXPORT_SYMBOL(sn_rtc_cycles_per_second);
-static int __cpuinit uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
+static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
{
#ifdef CONFIG_SMP
unsigned long val;
@@ -416,7 +416,7 @@ static struct apic __refdata apic_x2apic_uv_x = {
.safe_wait_icr_idle = native_safe_x2apic_wait_icr_idle,
};
-static __cpuinit void set_x2apic_extra_bits(int pnode)
+static void set_x2apic_extra_bits(int pnode)
{
__this_cpu_write(x2apic_extra_bits, pnode << uvh_apicid.s.pnode_shift);
}
@@ -735,7 +735,7 @@ static void uv_heartbeat(unsigned long ignored)
mod_timer_pinned(timer, jiffies + SCIR_CPU_HB_INTERVAL);
}
-static void __cpuinit uv_heartbeat_enable(int cpu)
+static void uv_heartbeat_enable(int cpu)
{
while (!uv_cpu_hub_info(cpu)->scir.enabled) {
struct timer_list *timer = &uv_cpu_hub_info(cpu)->scir.timer;
@@ -752,7 +752,7 @@ static void __cpuinit uv_heartbeat_enable(int cpu)
}
#ifdef CONFIG_HOTPLUG_CPU
-static void __cpuinit uv_heartbeat_disable(int cpu)
+static void uv_heartbeat_disable(int cpu)
{
if (uv_cpu_hub_info(cpu)->scir.enabled) {
uv_cpu_hub_info(cpu)->scir.enabled = 0;
@@ -764,8 +764,8 @@ static void __cpuinit uv_heartbeat_disable(int cpu)
/*
* cpu hotplug notifier
*/
-static __cpuinit int uv_scir_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int uv_scir_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
long cpu = (long)hcpu;
@@ -835,7 +835,7 @@ int uv_set_vga_state(struct pci_dev *pdev, bool decode,
* Called on each cpu to initialize the per_cpu UV data area.
* FIXME: hotplug not supported yet
*/
-void __cpuinit uv_cpu_init(void)
+void uv_cpu_init(void)
{
/* CPU 0 initilization will be done via uv_system_init. */
if (!uv_blade_info)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index c587a87..f654ece 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -69,7 +69,7 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
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
@@ -87,7 +87,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 = get_num_physpages() >> (20-PAGE_SHIFT);
@@ -179,7 +179,7 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
+static void amd_k7_smp_check(struct cpuinfo_x86 *c)
{
/* calling is from identify_secondary_cpu() ? */
if (!c->cpu_index)
@@ -222,7 +222,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE);
}
-static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)
+static void init_amd_k7(struct cpuinfo_x86 *c)
{
u32 l, h;
@@ -267,7 +267,7 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)
* To workaround broken NUMA config. Read the comment in
* srat_detect_node().
*/
-static int __cpuinit nearby_node(int apicid)
+static int nearby_node(int apicid)
{
int i, node;
@@ -292,7 +292,7 @@ static int __cpuinit nearby_node(int apicid)
* (2) AMD processors supporting compute units
*/
#ifdef CONFIG_X86_HT
-static void __cpuinit amd_get_topology(struct cpuinfo_x86 *c)
+static void amd_get_topology(struct cpuinfo_x86 *c)
{
u32 nodes, cores_per_cu = 1;
u8 node_id;
@@ -342,7 +342,7 @@ static void __cpuinit amd_get_topology(struct cpuinfo_x86 *c)
* 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;
@@ -369,7 +369,7 @@ u16 amd_get_nb_id(int cpu)
}
EXPORT_SYMBOL_GPL(amd_get_nb_id);
-static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
+static void srat_detect_node(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_NUMA
int cpu = smp_processor_id();
@@ -421,7 +421,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;
@@ -447,7 +447,7 @@ static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c)
#endif
}
-static void __cpuinit bsp_init_amd(struct cpuinfo_x86 *c)
+static void bsp_init_amd(struct cpuinfo_x86 *c)
{
if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
@@ -475,7 +475,7 @@ static void __cpuinit bsp_init_amd(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
+static void early_init_amd(struct cpuinfo_x86 *c)
{
early_init_amd_mc(c);
@@ -514,7 +514,7 @@ static const int amd_erratum_383[];
static const int amd_erratum_400[];
static bool cpu_has_amd_erratum(const int *erratum);
-static void __cpuinit init_amd(struct cpuinfo_x86 *c)
+static void init_amd(struct cpuinfo_x86 *c)
{
u32 dummy;
unsigned long long value;
@@ -740,8 +740,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)) {
@@ -757,7 +756,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
}
#endif
-static void __cpuinit cpu_set_tlb_flushall_shift(struct cpuinfo_x86 *c)
+static void cpu_set_tlb_flushall_shift(struct cpuinfo_x86 *c)
{
tlb_flushall_shift = 5;
@@ -765,7 +764,7 @@ static void __cpuinit cpu_set_tlb_flushall_shift(struct cpuinfo_x86 *c)
tlb_flushall_shift = 4;
}
-static void __cpuinit cpu_detect_tlb_amd(struct cpuinfo_x86 *c)
+static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c)
{
u32 ebx, eax, ecx, edx;
u16 mask = 0xfff;
@@ -820,7 +819,7 @@ static void __cpuinit cpu_detect_tlb_amd(struct cpuinfo_x86 *c)
cpu_set_tlb_flushall_shift(c);
}
-static const struct cpu_dev __cpuinitconst amd_cpu_dev = {
+static const struct cpu_dev amd_cpu_dev = {
.c_vendor = "AMD",
.c_ident = { "AuthenticAMD" },
#ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index 159103c..fbf6c3b 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -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;
@@ -318,7 +318,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) {
#ifdef CONFIG_X86_32
@@ -337,7 +337,7 @@ static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)
#endif
}
-static void __cpuinit init_centaur(struct cpuinfo_x86 *c)
+static void init_centaur(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_X86_32
char *name;
@@ -468,7 +468,7 @@ static void __cpuinit init_centaur(struct cpuinfo_x86 *c)
#endif
}
-static unsigned int __cpuinit
+static unsigned int
centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size)
{
#ifdef CONFIG_X86_32
@@ -488,7 +488,7 @@ centaur_size_cache(struct cpuinfo_x86 *c, unsigned int size)
return size;
}
-static const struct cpu_dev __cpuinitconst centaur_cpu_dev = {
+static const struct cpu_dev centaur_cpu_dev = {
.c_vendor = "Centaur",
.c_ident = { "CentaurHauls" },
.c_early_init = early_init_centaur,
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d4dd993..965c45f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -63,7 +63,7 @@ void __init setup_cpu_local_masks(void)
alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
}
-static void __cpuinit default_init(struct cpuinfo_x86 *c)
+static void default_init(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_X86_64
cpu_detect_cache_sizes(c);
@@ -80,13 +80,13 @@ static void __cpuinit default_init(struct cpuinfo_x86 *c)
#endif
}
-static const struct cpu_dev __cpuinitconst default_cpu = {
+static const struct cpu_dev default_cpu = {
.c_init = default_init,
.c_vendor = "Unknown",
.c_x86_vendor = X86_VENDOR_UNKNOWN,
};
-static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
+static const struct cpu_dev *this_cpu = &default_cpu;
DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
#ifdef CONFIG_X86_64
@@ -160,8 +160,8 @@ static int __init x86_xsaveopt_setup(char *s)
__setup("noxsaveopt", x86_xsaveopt_setup);
#ifdef CONFIG_X86_32
-static int cachesize_override __cpuinitdata = -1;
-static int disable_x86_serial_nr __cpuinitdata = 1;
+static int cachesize_override = -1;
+static int disable_x86_serial_nr = 1;
static int __init cachesize_setup(char *str)
{
@@ -215,12 +215,12 @@ static inline int flag_is_changeable_p(u32 flag)
}
/* Probe for the CPUID instruction */
-int __cpuinit have_cpuid_p(void)
+int have_cpuid_p(void)
{
return flag_is_changeable_p(X86_EFLAGS_ID);
}
-static void __cpuinit squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
+static void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
{
unsigned long lo, hi;
@@ -298,7 +298,7 @@ struct cpuid_dependent_feature {
u32 level;
};
-static const struct cpuid_dependent_feature __cpuinitconst
+static const struct cpuid_dependent_feature
cpuid_dependent_features[] = {
{ X86_FEATURE_MWAIT, 0x00000005 },
{ X86_FEATURE_DCA, 0x00000009 },
@@ -306,7 +306,7 @@ cpuid_dependent_features[] = {
{ 0, 0 }
};
-static void __cpuinit filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
+static void filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
{
const struct cpuid_dependent_feature *df;
@@ -344,7 +344,7 @@ static void __cpuinit filter_cpuid_features(struct cpuinfo_x86 *c, bool warn)
*/
/* Look up CPU names by table lookup. */
-static const char *__cpuinit table_lookup_model(struct cpuinfo_x86 *c)
+static const char *table_lookup_model(struct cpuinfo_x86 *c)
{
const struct cpu_model_info *info;
@@ -364,8 +364,8 @@ static const char *__cpuinit table_lookup_model(struct cpuinfo_x86 *c)
return NULL; /* Not found */
}
-__u32 cpu_caps_cleared[NCAPINTS] __cpuinitdata;
-__u32 cpu_caps_set[NCAPINTS] __cpuinitdata;
+__u32 cpu_caps_cleared[NCAPINTS];
+__u32 cpu_caps_set[NCAPINTS];
void load_percpu_segment(int cpu)
{
@@ -394,9 +394,9 @@ void switch_to_new_gdt(int cpu)
load_percpu_segment(cpu);
}
-static const struct cpu_dev *__cpuinitdata cpu_devs[X86_VENDOR_NUM] = {};
+static const struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
-static void __cpuinit get_model_name(struct cpuinfo_x86 *c)
+static void get_model_name(struct cpuinfo_x86 *c)
{
unsigned int *v;
char *p, *q;
@@ -425,7 +425,7 @@ static void __cpuinit get_model_name(struct cpuinfo_x86 *c)
}
}
-void __cpuinit cpu_detect_cache_sizes(struct cpuinfo_x86 *c)
+void cpu_detect_cache_sizes(struct cpuinfo_x86 *c)
{
unsigned int n, dummy, ebx, ecx, edx, l2size;
@@ -479,7 +479,7 @@ u16 __read_mostly tlb_lld_4m[NR_INFO];
*/
s8 __read_mostly tlb_flushall_shift = -1;
-void __cpuinit cpu_detect_tlb(struct cpuinfo_x86 *c)
+void cpu_detect_tlb(struct cpuinfo_x86 *c)
{
if (this_cpu->c_detect_tlb)
this_cpu->c_detect_tlb(c);
@@ -493,7 +493,7 @@ void __cpuinit cpu_detect_tlb(struct cpuinfo_x86 *c)
tlb_flushall_shift);
}
-void __cpuinit detect_ht(struct cpuinfo_x86 *c)
+void detect_ht(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_X86_HT
u32 eax, ebx, ecx, edx;
@@ -544,7 +544,7 @@ out:
#endif
}
-static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
+static void get_cpu_vendor(struct cpuinfo_x86 *c)
{
char *v = c->x86_vendor_id;
int i;
@@ -571,7 +571,7 @@ static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
this_cpu = &default_cpu;
}
-void __cpuinit cpu_detect(struct cpuinfo_x86 *c)
+void cpu_detect(struct cpuinfo_x86 *c)
{
/* Get vendor name */
cpuid(0x00000000, (unsigned int *)&c->cpuid_level,
@@ -601,7 +601,7 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c)
}
}
-void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
+void get_cpu_cap(struct cpuinfo_x86 *c)
{
u32 tfms, xlvl;
u32 ebx;
@@ -652,7 +652,7 @@ void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
init_scattered_cpuid_features(c);
}
-static void __cpuinit identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
+static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_X86_32
int i;
@@ -767,7 +767,7 @@ void __init early_cpu_init(void)
* unless we can find a reliable way to detect all the broken cases.
* Enable it explicitly on 64-bit for non-constant inputs of cpu_has().
*/
-static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)
+static void detect_nopl(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_X86_32
clear_cpu_cap(c, X86_FEATURE_NOPL);
@@ -776,7 +776,7 @@ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)
#endif
}
-static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
+static void generic_identify(struct cpuinfo_x86 *c)
{
c->extended_cpuid_level = 0;
@@ -813,7 +813,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
/*
* This does the hard work of actually picking apart the CPU stuff...
*/
-static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+static void identify_cpu(struct cpuinfo_x86 *c)
{
int i;
@@ -958,7 +958,7 @@ void __init identify_boot_cpu(void)
cpu_detect_tlb(&boot_cpu_data);
}
-void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c)
+void identify_secondary_cpu(struct cpuinfo_x86 *c)
{
BUG_ON(c == &boot_cpu_data);
identify_cpu(c);
@@ -973,14 +973,14 @@ struct msr_range {
unsigned max;
};
-static const struct msr_range msr_range_array[] __cpuinitconst = {
+static const struct msr_range msr_range_array[] = {
{ 0x00000000, 0x00000418},
{ 0xc0000000, 0xc000040b},
{ 0xc0010000, 0xc0010142},
{ 0xc0011000, 0xc001103b},
};
-static void __cpuinit __print_cpu_msr(void)
+static void __print_cpu_msr(void)
{
unsigned index_min, index_max;
unsigned index;
@@ -999,7 +999,7 @@ static void __cpuinit __print_cpu_msr(void)
}
}
-static int show_msr __cpuinitdata;
+static int show_msr;
static __init int setup_show_msr(char *arg)
{
@@ -1020,7 +1020,7 @@ static __init int setup_noclflush(char *arg)
}
__setup("noclflush", setup_noclflush);
-void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)
+void print_cpu_info(struct cpuinfo_x86 *c)
{
const char *vendor = NULL;
@@ -1049,7 +1049,7 @@ void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)
print_cpu_msr(c);
}
-void __cpuinit print_cpu_msr(struct cpuinfo_x86 *c)
+void print_cpu_msr(struct cpuinfo_x86 *c)
{
if (c->cpu_index < show_msr)
__print_cpu_msr();
@@ -1214,7 +1214,7 @@ static void dbg_restore_debug_regs(void)
*/
#ifdef CONFIG_X86_64
-void __cpuinit cpu_init(void)
+void cpu_init(void)
{
struct orig_ist *oist;
struct task_struct *me;
@@ -1313,7 +1313,7 @@ void __cpuinit cpu_init(void)
#else
-void __cpuinit cpu_init(void)
+void cpu_init(void)
{
int cpu = smp_processor_id();
struct task_struct *curr = current;
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 7582f47..d0969c7 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -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)
{
unsigned char ccr2, ccr3;
@@ -44,7 +44,7 @@ static void __cpuinit __do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
}
}
-static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
+static void do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
{
unsigned long flags;
@@ -59,25 +59,25 @@ static void __cpuinit do_cyrix_devid(unsigned char *dir0, unsigned char *dir1)
* Actually since bugs.h doesn't even reference this perhaps someone should
* fix the documentation ???
*/
-static unsigned char Cx86_dir0_msb __cpuinitdata = 0;
+static unsigned char Cx86_dir0_msb = 0;
-static const char __cpuinitconst Cx86_model[][9] = {
+static const char Cx86_model[][9] = {
"Cx486", "Cx486", "5x86 ", "6x86", "MediaGX ", "6x86MX ",
"M II ", "Unknown"
};
-static const char __cpuinitconst Cx486_name[][5] = {
+static const char Cx486_name[][5] = {
"SLC", "DLC", "SLC2", "DLC2", "SRx", "DRx",
"SRx2", "DRx2"
};
-static const char __cpuinitconst Cx486S_name[][4] = {
+static const char Cx486S_name[][4] = {
"S", "S2", "Se", "S2e"
};
-static const char __cpuinitconst Cx486D_name[][4] = {
+static const char Cx486D_name[][4] = {
"DX", "DX2", "?", "?", "?", "DX4"
};
-static char Cx86_cb[] __cpuinitdata = "?.5x Core/Bus Clock";
-static const char __cpuinitconst cyrix_model_mult1[] = "12??43";
-static const char __cpuinitconst cyrix_model_mult2[] = "12233445";
+static char Cx86_cb[] = "?.5x Core/Bus Clock";
+static const char cyrix_model_mult1[] = "12??43";
+static const char cyrix_model_mult2[] = "12233445";
/*
* Reset the slow-loop (SLOP) bit on the 686(L) which is set by some old
@@ -87,7 +87,7 @@ static const char __cpuinitconst cyrix_model_mult2[] = "12233445";
* FIXME: our newer udelay uses the tsc. We don't need to frob with SLOP
*/
-static void __cpuinit check_cx686_slop(struct cpuinfo_x86 *c)
+static void check_cx686_slop(struct cpuinfo_x86 *c)
{
unsigned long flags;
@@ -112,7 +112,7 @@ static void __cpuinit check_cx686_slop(struct cpuinfo_x86 *c)
}
-static void __cpuinit set_cx86_reorder(void)
+static void set_cx86_reorder(void)
{
u8 ccr3;
@@ -127,7 +127,7 @@ static void __cpuinit set_cx86_reorder(void)
setCx86(CX86_CCR3, ccr3);
}
-static void __cpuinit set_cx86_memwb(void)
+static void set_cx86_memwb(void)
{
printk(KERN_INFO "Enable Memory-Write-back mode on Cyrix/NSC processor.\n");
@@ -143,7 +143,7 @@ static void __cpuinit set_cx86_memwb(void)
* Configure later MediaGX and/or Geode processor.
*/
-static void __cpuinit geode_configure(void)
+static void geode_configure(void)
{
unsigned long flags;
u8 ccr3;
@@ -166,7 +166,7 @@ static void __cpuinit geode_configure(void)
local_irq_restore(flags);
}
-static void __cpuinit early_init_cyrix(struct cpuinfo_x86 *c)
+static void early_init_cyrix(struct cpuinfo_x86 *c)
{
unsigned char dir0, dir0_msn, dir1 = 0;
@@ -185,7 +185,7 @@ static void __cpuinit early_init_cyrix(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
+static void init_cyrix(struct cpuinfo_x86 *c)
{
unsigned char dir0, dir0_msn, dir0_lsn, dir1 = 0;
char *buf = c->x86_model_id;
@@ -356,7 +356,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
/*
* Handle National Semiconductor branded processors
*/
-static void __cpuinit init_nsc(struct cpuinfo_x86 *c)
+static void init_nsc(struct cpuinfo_x86 *c)
{
/*
* There may be GX1 processors in the wild that are branded
@@ -405,7 +405,7 @@ static inline int test_cyrix_52div(void)
return (unsigned char) (test >> 8) == 0x02;
}
-static void __cpuinit cyrix_identify(struct cpuinfo_x86 *c)
+static void cyrix_identify(struct cpuinfo_x86 *c)
{
/* Detect Cyrix with disabled CPUID */
if (c->x86 == 4 && test_cyrix_52div()) {
@@ -441,7 +441,7 @@ static void __cpuinit cyrix_identify(struct cpuinfo_x86 *c)
}
}
-static const struct cpu_dev __cpuinitconst cyrix_cpu_dev = {
+static const struct cpu_dev cyrix_cpu_dev = {
.c_vendor = "Cyrix",
.c_ident = { "CyrixInstead" },
.c_early_init = early_init_cyrix,
@@ -452,7 +452,7 @@ static const struct cpu_dev __cpuinitconst cyrix_cpu_dev = {
cpu_dev_register(cyrix_cpu_dev);
-static const struct cpu_dev __cpuinitconst nsc_cpu_dev = {
+static const struct cpu_dev nsc_cpu_dev = {
.c_vendor = "NSC",
.c_ident = { "Geode by NSC" },
.c_init = init_nsc,
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 1e7e84a..8727921 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -60,7 +60,7 @@ detect_hypervisor_vendor(void)
}
}
-void __cpuinit init_hypervisor(struct cpuinfo_x86 *c)
+void init_hypervisor(struct cpuinfo_x86 *c)
{
if (x86_hyper && x86_hyper->set_cpu_features)
x86_hyper->set_cpu_features(c);
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 9b0c441..ec72995 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -26,7 +26,7 @@
#include <asm/apic.h>
#endif
-static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
+static void early_init_intel(struct cpuinfo_x86 *c)
{
u64 misc_enable;
@@ -163,7 +163,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
* This is called before we do cpu ident work
*/
-int __cpuinit ppro_with_ram_bug(void)
+int ppro_with_ram_bug(void)
{
/* Uses data from early_cpu_detect now */
if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
@@ -176,7 +176,7 @@ int __cpuinit ppro_with_ram_bug(void)
return 0;
}
-static void __cpuinit intel_smp_check(struct cpuinfo_x86 *c)
+static void intel_smp_check(struct cpuinfo_x86 *c)
{
/* calling is from identify_secondary_cpu() ? */
if (!c->cpu_index)
@@ -196,7 +196,7 @@ static void __cpuinit intel_smp_check(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
+static void intel_workarounds(struct cpuinfo_x86 *c)
{
unsigned long lo, hi;
@@ -275,12 +275,12 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
intel_smp_check(c);
}
#else
-static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
+static void intel_workarounds(struct cpuinfo_x86 *c)
{
}
#endif
-static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
+static void srat_detect_node(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_NUMA
unsigned node;
@@ -300,7 +300,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
/*
* find out the number of processor cores on the die
*/
-static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
+static int intel_num_cpu_cores(struct cpuinfo_x86 *c)
{
unsigned int eax, ebx, ecx, edx;
@@ -315,7 +315,7 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
return 1;
}
-static void __cpuinit detect_vmx_virtcap(struct cpuinfo_x86 *c)
+static void detect_vmx_virtcap(struct cpuinfo_x86 *c)
{
/* Intel VMX MSR indicated features */
#define X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW 0x00200000
@@ -353,7 +353,7 @@ static void __cpuinit detect_vmx_virtcap(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit init_intel(struct cpuinfo_x86 *c)
+static void init_intel(struct cpuinfo_x86 *c)
{
unsigned int l2 = 0;
@@ -472,7 +472,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
}
#ifdef CONFIG_X86_32
-static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
+static unsigned int intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
{
/*
* Intel PIII Tualatin. This comes in two flavours.
@@ -506,7 +506,7 @@ static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned i
#define STLB_4K 0x41
-static const struct _tlb_table intel_tlb_table[] __cpuinitconst = {
+static const struct _tlb_table intel_tlb_table[] = {
{ 0x01, TLB_INST_4K, 32, " TLB_INST 4 KByte pages, 4-way set associative" },
{ 0x02, TLB_INST_4M, 2, " TLB_INST 4 MByte pages, full associative" },
{ 0x03, TLB_DATA_4K, 64, " TLB_DATA 4 KByte pages, 4-way set associative" },
@@ -536,7 +536,7 @@ static const struct _tlb_table intel_tlb_table[] __cpuinitconst = {
{ 0x00, 0, 0 }
};
-static void __cpuinit intel_tlb_lookup(const unsigned char desc)
+static void intel_tlb_lookup(const unsigned char desc)
{
unsigned char k;
if (desc == 0)
@@ -605,7 +605,7 @@ static void __cpuinit intel_tlb_lookup(const unsigned char desc)
}
}
-static void __cpuinit intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c)
+static void intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c)
{
switch ((c->x86 << 8) + c->x86_model) {
case 0x60f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */
@@ -634,7 +634,7 @@ static void __cpuinit intel_tlb_flushall_shift_set(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit intel_detect_tlb(struct cpuinfo_x86 *c)
+static void intel_detect_tlb(struct cpuinfo_x86 *c)
{
int i, j, n;
unsigned int regs[4];
@@ -661,7 +661,7 @@ static void __cpuinit intel_detect_tlb(struct cpuinfo_x86 *c)
intel_tlb_flushall_shift_set(c);
}
-static const struct cpu_dev __cpuinitconst intel_cpu_dev = {
+static const struct cpu_dev intel_cpu_dev = {
.c_vendor = "Intel",
.c_ident = { "GenuineIntel" },
#ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 7c6f7d5..8e2a3b9 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -37,7 +37,7 @@ struct _cache_table {
/* All the cache descriptor types we care about (no TLB or
trace cache entries) */
-static const struct _cache_table __cpuinitconst cache_table[] =
+static const struct _cache_table cache_table[] =
{
{ 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */
{ 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */
@@ -203,7 +203,7 @@ union l3_cache {
unsigned val;
};
-static const unsigned short __cpuinitconst assocs[] = {
+static const unsigned short assocs[] = {
[1] = 1,
[2] = 2,
[4] = 4,
@@ -217,10 +217,10 @@ static const unsigned short __cpuinitconst assocs[] = {
[0xf] = 0xffff /* fully associative - no way to show this currently */
};
-static const unsigned char __cpuinitconst levels[] = { 1, 1, 2, 3 };
-static const unsigned char __cpuinitconst types[] = { 1, 2, 3, 3 };
+static const unsigned char levels[] = { 1, 1, 2, 3 };
+static const unsigned char types[] = { 1, 2, 3, 3 };
-static void __cpuinit
+static void
amd_cpuid4(int leaf, union _cpuid4_leaf_eax *eax,
union _cpuid4_leaf_ebx *ebx,
union _cpuid4_leaf_ecx *ecx)
@@ -302,7 +302,7 @@ struct _cache_attr {
/*
* L3 cache descriptors
*/
-static void __cpuinit amd_calc_l3_indices(struct amd_northbridge *nb)
+static void amd_calc_l3_indices(struct amd_northbridge *nb)
{
struct amd_l3_cache *l3 = &nb->l3_cache;
unsigned int sc0, sc1, sc2, sc3;
@@ -325,7 +325,7 @@ static void __cpuinit amd_calc_l3_indices(struct amd_northbridge *nb)
l3->indices = (max(max3(sc0, sc1, sc2), sc3) << 10) - 1;
}
-static void __cpuinit amd_init_l3_cache(struct _cpuid4_info_regs *this_leaf, int index)
+static void amd_init_l3_cache(struct _cpuid4_info_regs *this_leaf, int index)
{
int node;
@@ -528,8 +528,7 @@ static struct _cache_attr subcaches =
#endif /* CONFIG_AMD_NB && CONFIG_SYSFS */
static int
-__cpuinit cpuid4_cache_lookup_regs(int index,
- struct _cpuid4_info_regs *this_leaf)
+cpuid4_cache_lookup_regs(int index, struct _cpuid4_info_regs *this_leaf)
{
union _cpuid4_leaf_eax eax;
union _cpuid4_leaf_ebx ebx;
@@ -560,7 +559,7 @@ __cpuinit cpuid4_cache_lookup_regs(int index,
return 0;
}
-static int __cpuinit find_num_cache_leaves(struct cpuinfo_x86 *c)
+static int find_num_cache_leaves(struct cpuinfo_x86 *c)
{
unsigned int eax, ebx, ecx, edx, op;
union _cpuid4_leaf_eax cache_eax;
@@ -580,7 +579,7 @@ static int __cpuinit find_num_cache_leaves(struct cpuinfo_x86 *c)
return i;
}
-void __cpuinit init_amd_cacheinfo(struct cpuinfo_x86 *c)
+void init_amd_cacheinfo(struct cpuinfo_x86 *c)
{
if (cpu_has_topoext) {
@@ -593,7 +592,7 @@ void __cpuinit init_amd_cacheinfo(struct cpuinfo_x86 *c)
}
}
-unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
+unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c)
{
/* Cache sizes */
unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0;
@@ -746,7 +745,7 @@ static DEFINE_PER_CPU(struct _cpuid4_info *, ici_cpuid4_info);
#ifdef CONFIG_SMP
-static int __cpuinit cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
+static int cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
{
struct _cpuid4_info *this_leaf;
int i, sibling;
@@ -795,7 +794,7 @@ static int __cpuinit cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
return 1;
}
-static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)
+static void cache_shared_cpu_map_setup(unsigned int cpu, int index)
{
struct _cpuid4_info *this_leaf, *sibling_leaf;
unsigned long num_threads_sharing;
@@ -830,7 +829,7 @@ static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)
}
}
}
-static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index)
+static void cache_remove_shared_cpu_map(unsigned int cpu, int index)
{
struct _cpuid4_info *this_leaf, *sibling_leaf;
int sibling;
@@ -843,16 +842,16 @@ static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index)
}
}
#else
-static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)
+static void cache_shared_cpu_map_setup(unsigned int cpu, int index)
{
}
-static void __cpuinit cache_remove_shared_cpu_map(unsigned int cpu, int index)
+static void cache_remove_shared_cpu_map(unsigned int cpu, int index)
{
}
#endif
-static void __cpuinit free_cache_attributes(unsigned int cpu)
+static void free_cache_attributes(unsigned int cpu)
{
int i;
@@ -863,7 +862,7 @@ static void __cpuinit free_cache_attributes(unsigned int cpu)
per_cpu(ici_cpuid4_info, cpu) = NULL;
}
-static void __cpuinit get_cpu_leaves(void *_retval)
+static void get_cpu_leaves(void *_retval)
{
int j, *retval = _retval, cpu = smp_processor_id();
@@ -883,7 +882,7 @@ static void __cpuinit get_cpu_leaves(void *_retval)
}
}
-static int __cpuinit detect_cache_attributes(unsigned int cpu)
+static int detect_cache_attributes(unsigned int cpu)
{
int retval;
@@ -1017,7 +1016,7 @@ static struct attribute *default_attrs[] = {
};
#ifdef CONFIG_AMD_NB
-static struct attribute ** __cpuinit amd_l3_attrs(void)
+static struct attribute **amd_l3_attrs(void)
{
static struct attribute **attrs;
int n;
@@ -1093,7 +1092,7 @@ static struct kobj_type ktype_percpu_entry = {
.sysfs_ops = &sysfs_ops,
};
-static void __cpuinit cpuid4_cache_sysfs_exit(unsigned int cpu)
+static void cpuid4_cache_sysfs_exit(unsigned int cpu)
{
kfree(per_cpu(ici_cache_kobject, cpu));
kfree(per_cpu(ici_index_kobject, cpu));
@@ -1102,7 +1101,7 @@ static void __cpuinit cpuid4_cache_sysfs_exit(unsigned int cpu)
free_cache_attributes(cpu);
}
-static int __cpuinit cpuid4_cache_sysfs_init(unsigned int cpu)
+static int cpuid4_cache_sysfs_init(unsigned int cpu)
{
int err;
@@ -1134,7 +1133,7 @@ err_out:
static DECLARE_BITMAP(cache_dev_map, NR_CPUS);
/* Add/Remove cache interface for CPU device */
-static int __cpuinit cache_add_dev(struct device *dev)
+static int cache_add_dev(struct device *dev)
{
unsigned int cpu = dev->id;
unsigned long i, j;
@@ -1185,7 +1184,7 @@ static int __cpuinit cache_add_dev(struct device *dev)
return 0;
}
-static void __cpuinit cache_remove_dev(struct device *dev)
+static void cache_remove_dev(struct device *dev)
{
unsigned int cpu = dev->id;
unsigned long i;
@@ -1202,8 +1201,8 @@ static void __cpuinit cache_remove_dev(struct device *dev)
cpuid4_cache_sysfs_exit(cpu);
}
-static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int cacheinfo_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
struct device *dev;
@@ -1222,7 +1221,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
+static struct notifier_block cacheinfo_cpu_notifier = {
.notifier_call = cacheinfo_cpu_callback,
};
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 9239504..ce660f6 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1360,7 +1360,7 @@ int mce_notify_irq(void)
}
EXPORT_SYMBOL_GPL(mce_notify_irq);
-static int __cpuinit __mcheck_cpu_mce_banks_init(void)
+static int __mcheck_cpu_mce_banks_init(void)
{
int i;
u8 num_banks = mca_cfg.banks;
@@ -1381,7 +1381,7 @@ static int __cpuinit __mcheck_cpu_mce_banks_init(void)
/*
* Initialize Machine Checks for a CPU.
*/
-static int __cpuinit __mcheck_cpu_cap_init(void)
+static int __mcheck_cpu_cap_init(void)
{
unsigned b;
u64 cap;
@@ -1480,7 +1480,7 @@ static void quirk_sandybridge_ifu(int bank, struct mce *m, struct pt_regs *regs)
}
/* Add per CPU specific workarounds here */
-static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
+static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
{
struct mca_config *cfg = &mca_cfg;
@@ -1590,7 +1590,7 @@ static int __cpuinit __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
return 0;
}
-static int __cpuinit __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)
+static int __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)
{
if (c->x86 != 5)
return 0;
@@ -1661,7 +1661,7 @@ void (*machine_check_vector)(struct pt_regs *, long error_code) =
* Called for each booted CPU to set up machine checks.
* Must be called with preempt off:
*/
-void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
+void mcheck_cpu_init(struct cpuinfo_x86 *c)
{
if (mca_cfg.disabled)
return;
@@ -2079,7 +2079,6 @@ static struct bus_type mce_subsys = {
DEFINE_PER_CPU(struct device *, mce_device);
-__cpuinitdata
void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
static inline struct mce_bank *attr_to_bank(struct device_attribute *attr)
@@ -2225,7 +2224,7 @@ static void mce_device_release(struct device *dev)
}
/* Per cpu device init. All of the cpus still share the same ctrl bank: */
-static __cpuinit int mce_device_create(unsigned int cpu)
+static int mce_device_create(unsigned int cpu)
{
struct device *dev;
int err;
@@ -2271,7 +2270,7 @@ error:
return err;
}
-static __cpuinit void mce_device_remove(unsigned int cpu)
+static void mce_device_remove(unsigned int cpu)
{
struct device *dev = per_cpu(mce_device, cpu);
int i;
@@ -2291,7 +2290,7 @@ static __cpuinit void mce_device_remove(unsigned int cpu)
}
/* Make sure there are no machine checks on offlined CPUs. */
-static void __cpuinit mce_disable_cpu(void *h)
+static void mce_disable_cpu(void *h)
{
unsigned long action = *(unsigned long *)h;
int i;
@@ -2309,7 +2308,7 @@ static void __cpuinit mce_disable_cpu(void *h)
}
}
-static void __cpuinit mce_reenable_cpu(void *h)
+static void mce_reenable_cpu(void *h)
{
unsigned long action = *(unsigned long *)h;
int i;
@@ -2328,7 +2327,7 @@ static void __cpuinit mce_reenable_cpu(void *h)
}
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
-static int __cpuinit
+static int
mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@@ -2364,7 +2363,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block mce_cpu_notifier __cpuinitdata = {
+static struct notifier_block mce_cpu_notifier = {
.notifier_call = mce_cpu_callback,
};
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 9cb5276..603df4f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -458,10 +458,8 @@ static struct kobj_type threshold_ktype = {
.default_attrs = default_attrs,
};
-static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
- unsigned int bank,
- unsigned int block,
- u32 address)
+static int allocate_threshold_blocks(unsigned int cpu, unsigned int bank,
+ unsigned int block, u32 address)
{
struct threshold_block *b = NULL;
u32 low, high;
@@ -543,7 +541,7 @@ out_free:
return err;
}
-static __cpuinit int __threshold_add_blocks(struct threshold_bank *b)
+static int __threshold_add_blocks(struct threshold_bank *b)
{
struct list_head *head = &b->blocks->miscj;
struct threshold_block *pos = NULL;
@@ -567,7 +565,7 @@ static __cpuinit int __threshold_add_blocks(struct threshold_bank *b)
return err;
}
-static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
+static int threshold_create_bank(unsigned int cpu, unsigned int bank)
{
struct device *dev = per_cpu(mce_device, cpu);
struct amd_northbridge *nb = NULL;
@@ -632,7 +630,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
}
/* create dir/files for all valid threshold banks */
-static __cpuinit int threshold_create_device(unsigned int cpu)
+static int threshold_create_device(unsigned int cpu)
{
unsigned int bank;
struct threshold_bank **bp;
@@ -736,7 +734,7 @@ static void threshold_remove_device(unsigned int cpu)
}
/* get notified when a cpu comes on/off */
-static void __cpuinit
+static void
amd_64_threshold_cpu_callback(unsigned long action, unsigned int cpu)
{
switch (action) {
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 6d10fbf..c4f3453 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -239,8 +239,7 @@ __setup("int_pln_enable", int_pln_enable_setup);
#ifdef CONFIG_SYSFS
/* Add/Remove thermal_throttle interface for CPU device: */
-static __cpuinit int thermal_throttle_add_dev(struct device *dev,
- unsigned int cpu)
+static int thermal_throttle_add_dev(struct device *dev, unsigned int cpu)
{
int err;
struct cpuinfo_x86 *c = &cpu_data(cpu);
@@ -266,7 +265,7 @@ static __cpuinit int thermal_throttle_add_dev(struct device *dev,
return err;
}
-static __cpuinit void thermal_throttle_remove_dev(struct device *dev)
+static void thermal_throttle_remove_dev(struct device *dev)
{
sysfs_remove_group(&dev->kobj, &thermal_attr_group);
}
@@ -275,7 +274,7 @@ static __cpuinit void thermal_throttle_remove_dev(struct device *dev)
static DEFINE_MUTEX(therm_cpu_lock);
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
-static __cpuinit int
+static int
thermal_throttle_cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
@@ -306,7 +305,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
return notifier_from_errno(err);
}
-static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =
+static struct notifier_block thermal_throttle_cpu_notifier =
{
.notifier_call = thermal_throttle_cpu_callback,
};
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index ab33952..0bfb4d8 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1261,7 +1261,7 @@ perf_event_nmi_handler(unsigned int cmd, struct pt_regs *regs)
struct event_constraint emptyconstraint;
struct event_constraint unconstrained;
-static int __cpuinit
+static int
x86_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c
index 5f0581e..e09f0bf 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c
@@ -851,7 +851,7 @@ static void clear_APIC_ibs(void *dummy)
setup_APIC_eilvt(offset, 0, APIC_EILVT_MSG_FIX, 1);
}
-static int __cpuinit
+static int
perf_ibs_cpu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{
switch (action & ~CPU_TASKS_FROZEN) {
diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
index c0c661a..754291a 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
@@ -288,13 +288,13 @@ static struct pmu amd_l2_pmu = {
.read = amd_uncore_read,
};
-static struct amd_uncore * __cpuinit amd_uncore_alloc(unsigned int cpu)
+static struct amd_uncore *amd_uncore_alloc(unsigned int cpu)
{
return kzalloc_node(sizeof(struct amd_uncore), GFP_KERNEL,
cpu_to_node(cpu));
}
-static void __cpuinit amd_uncore_cpu_up_prepare(unsigned int cpu)
+static void amd_uncore_cpu_up_prepare(unsigned int cpu)
{
struct amd_uncore *uncore;
@@ -322,8 +322,8 @@ static void __cpuinit amd_uncore_cpu_up_prepare(unsigned int cpu)
}
static struct amd_uncore *
-__cpuinit amd_uncore_find_online_sibling(struct amd_uncore *this,
- struct amd_uncore * __percpu *uncores)
+amd_uncore_find_online_sibling(struct amd_uncore *this,
+ struct amd_uncore * __percpu *uncores)
{
unsigned int cpu;
struct amd_uncore *that;
@@ -348,7 +348,7 @@ __cpuinit amd_uncore_find_online_sibling(struct amd_uncore *this,
return this;
}
-static void __cpuinit amd_uncore_cpu_starting(unsigned int cpu)
+static void amd_uncore_cpu_starting(unsigned int cpu)
{
unsigned int eax, ebx, ecx, edx;
struct amd_uncore *uncore;
@@ -376,8 +376,8 @@ static void __cpuinit amd_uncore_cpu_starting(unsigned int cpu)
}
}
-static void __cpuinit uncore_online(unsigned int cpu,
- struct amd_uncore * __percpu *uncores)
+static void uncore_online(unsigned int cpu,
+ struct amd_uncore * __percpu *uncores)
{
struct amd_uncore *uncore = *per_cpu_ptr(uncores, cpu);
@@ -388,7 +388,7 @@ static void __cpuinit uncore_online(unsigned int cpu,
cpumask_set_cpu(cpu, uncore->active_mask);
}
-static void __cpuinit amd_uncore_cpu_online(unsigned int cpu)
+static void amd_uncore_cpu_online(unsigned int cpu)
{
if (amd_uncore_nb)
uncore_online(cpu, amd_uncore_nb);
@@ -397,8 +397,8 @@ static void __cpuinit amd_uncore_cpu_online(unsigned int cpu)
uncore_online(cpu, amd_uncore_l2);
}
-static void __cpuinit uncore_down_prepare(unsigned int cpu,
- struct amd_uncore * __percpu *uncores)
+static void uncore_down_prepare(unsigned int cpu,
+ struct amd_uncore * __percpu *uncores)
{
unsigned int i;
struct amd_uncore *this = *per_cpu_ptr(uncores, cpu);
@@ -423,7 +423,7 @@ static void __cpuinit uncore_down_prepare(unsigned int cpu,
}
}
-static void __cpuinit amd_uncore_cpu_down_prepare(unsigned int cpu)
+static void amd_uncore_cpu_down_prepare(unsigned int cpu)
{
if (amd_uncore_nb)
uncore_down_prepare(cpu, amd_uncore_nb);
@@ -432,8 +432,7 @@ static void __cpuinit amd_uncore_cpu_down_prepare(unsigned int cpu)
uncore_down_prepare(cpu, amd_uncore_l2);
}
-static void __cpuinit uncore_dead(unsigned int cpu,
- struct amd_uncore * __percpu *uncores)
+static void uncore_dead(unsigned int cpu, struct amd_uncore * __percpu *uncores)
{
struct amd_uncore *uncore = *per_cpu_ptr(uncores, cpu);
@@ -445,7 +444,7 @@ static void __cpuinit uncore_dead(unsigned int cpu,
*per_cpu_ptr(amd_uncore_nb, cpu) = NULL;
}
-static void __cpuinit amd_uncore_cpu_dead(unsigned int cpu)
+static void amd_uncore_cpu_dead(unsigned int cpu)
{
if (amd_uncore_nb)
uncore_dead(cpu, amd_uncore_nb);
@@ -454,7 +453,7 @@ static void __cpuinit amd_uncore_cpu_dead(unsigned int cpu)
uncore_dead(cpu, amd_uncore_l2);
}
-static int __cpuinit
+static int
amd_uncore_cpu_notifier(struct notifier_block *self, unsigned long action,
void *hcpu)
{
@@ -489,7 +488,7 @@ amd_uncore_cpu_notifier(struct notifier_block *self, unsigned long action,
return NOTIFY_OK;
}
-static struct notifier_block amd_uncore_cpu_notifier_block __cpuinitdata = {
+static struct notifier_block amd_uncore_cpu_notifier_block = {
.notifier_call = amd_uncore_cpu_notifier,
.priority = CPU_PRI_PERF + 1,
};
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 9dd9975..cad791d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -3297,7 +3297,7 @@ static void __init uncore_pci_exit(void)
/* CPU hot plug/unplug are serialized by cpu_add_remove_lock mutex */
static LIST_HEAD(boxes_to_free);
-static void __cpuinit uncore_kfree_boxes(void)
+static void uncore_kfree_boxes(void)
{
struct intel_uncore_box *box;
@@ -3309,7 +3309,7 @@ static void __cpuinit uncore_kfree_boxes(void)
}
}
-static void __cpuinit uncore_cpu_dying(int cpu)
+static void uncore_cpu_dying(int cpu)
{
struct intel_uncore_type *type;
struct intel_uncore_pmu *pmu;
@@ -3328,7 +3328,7 @@ static void __cpuinit uncore_cpu_dying(int cpu)
}
}
-static int __cpuinit uncore_cpu_starting(int cpu)
+static int uncore_cpu_starting(int cpu)
{
struct intel_uncore_type *type;
struct intel_uncore_pmu *pmu;
@@ -3371,7 +3371,7 @@ static int __cpuinit uncore_cpu_starting(int cpu)
return 0;
}
-static int __cpuinit uncore_cpu_prepare(int cpu, int phys_id)
+static int uncore_cpu_prepare(int cpu, int phys_id)
{
struct intel_uncore_type *type;
struct intel_uncore_pmu *pmu;
@@ -3397,7 +3397,7 @@ static int __cpuinit uncore_cpu_prepare(int cpu, int phys_id)
return 0;
}
-static void __cpuinit
+static void
uncore_change_context(struct intel_uncore_type **uncores, int old_cpu, int new_cpu)
{
struct intel_uncore_type *type;
@@ -3435,7 +3435,7 @@ uncore_change_context(struct intel_uncore_type **uncores, int old_cpu, int new_c
}
}
-static void __cpuinit uncore_event_exit_cpu(int cpu)
+static void uncore_event_exit_cpu(int cpu)
{
int i, phys_id, target;
@@ -3463,7 +3463,7 @@ static void __cpuinit uncore_event_exit_cpu(int cpu)
uncore_change_context(pci_uncores, cpu, target);
}
-static void __cpuinit uncore_event_init_cpu(int cpu)
+static void uncore_event_init_cpu(int cpu)
{
int i, phys_id;
@@ -3479,8 +3479,8 @@ static void __cpuinit uncore_event_init_cpu(int cpu)
uncore_change_context(pci_uncores, -1, cpu);
}
-static int
- __cpuinit uncore_cpu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
+static int uncore_cpu_notifier(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
@@ -3520,7 +3520,7 @@ static int
return NOTIFY_OK;
}
-static struct notifier_block uncore_cpu_nb __cpuinitdata = {
+static struct notifier_block uncore_cpu_nb = {
.notifier_call = uncore_cpu_notifier,
/*
* to migrate uncore events, our notifier should be executed
diff --git a/arch/x86/kernel/cpu/rdrand.c b/arch/x86/kernel/cpu/rdrand.c
index feca286..88db010 100644
--- a/arch/x86/kernel/cpu/rdrand.c
+++ b/arch/x86/kernel/cpu/rdrand.c
@@ -52,7 +52,7 @@ static inline int rdrand_long(unsigned long *v)
*/
#define RESEED_LOOP ((512*128)/sizeof(unsigned long))
-void __cpuinit x86_init_rdrand(struct cpuinfo_x86 *c)
+void x86_init_rdrand(struct cpuinfo_x86 *c)
{
#ifdef CONFIG_ARCH_RANDOM
unsigned long tmp;
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index d92b5da..f2cc63e 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -24,13 +24,13 @@ 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];
const struct cpuid_bit *cb;
- static const struct cpuid_bit __cpuinitconst cpuid_bits[] = {
+ static const struct cpuid_bit cpuid_bits[] = {
{ X86_FEATURE_DTHERM, CR_EAX, 0, 0x00000006, 0 },
{ X86_FEATURE_IDA, CR_EAX, 1, 0x00000006, 0 },
{ X86_FEATURE_ARAT, CR_EAX, 2, 0x00000006, 0 },
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c
index 4397e98..4c60eaf 100644
--- a/arch/x86/kernel/cpu/topology.c
+++ b/arch/x86/kernel/cpu/topology.c
@@ -26,7 +26,7 @@
* 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;
diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
index 2800074..aa0430d 100644
--- a/arch/x86/kernel/cpu/transmeta.c
+++ b/arch/x86/kernel/cpu/transmeta.c
@@ -5,7 +5,7 @@
#include <asm/msr.h>
#include "cpu.h"
-static void __cpuinit early_init_transmeta(struct cpuinfo_x86 *c)
+static void early_init_transmeta(struct cpuinfo_x86 *c)
{
u32 xlvl;
@@ -17,7 +17,7 @@ static void __cpuinit early_init_transmeta(struct cpuinfo_x86 *c)
}
}
-static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)
+static void init_transmeta(struct cpuinfo_x86 *c)
{
unsigned int cap_mask, uk, max, dummy;
unsigned int cms_rev1, cms_rev2;
@@ -98,7 +98,7 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)
#endif
}
-static const struct cpu_dev __cpuinitconst transmeta_cpu_dev = {
+static const struct cpu_dev transmeta_cpu_dev = {
.c_vendor = "Transmeta",
.c_ident = { "GenuineTMx86", "TransmetaCPU" },
.c_early_init = early_init_transmeta,
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
index fd2c37b..202759a 100644
--- a/arch/x86/kernel/cpu/umc.c
+++ b/arch/x86/kernel/cpu/umc.c
@@ -8,7 +8,7 @@
* so no special init takes place.
*/
-static const struct cpu_dev __cpuinitconst umc_cpu_dev = {
+static const struct cpu_dev umc_cpu_dev = {
.c_vendor = "UMC",
.c_ident = { "UMC UMC UMC" },
.c_models = {
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 03a3632..7076878 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -122,7 +122,7 @@ static bool __init vmware_platform(void)
* so that the kernel could just trust the hypervisor with providing a
* reliable virtual TSC that is suitable for timekeeping.
*/
-static void __cpuinit vmware_set_cpu_features(struct cpuinfo_x86 *c)
+static void vmware_set_cpu_features(struct cpuinfo_x86 *c)
{
set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
set_cpu_cap(c, X86_FEATURE_TSC_RELIABLE);
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 1e4dbcf..7d9481c 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -137,7 +137,7 @@ static const struct file_operations cpuid_fops = {
.open = cpuid_open,
};
-static __cpuinit int cpuid_device_create(int cpu)
+static int cpuid_device_create(int cpu)
{
struct device *dev;
@@ -151,9 +151,8 @@ static void cpuid_device_destroy(int cpu)
device_destroy(cpuid_class, MKDEV(CPUID_MAJOR, cpu));
}
-static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
- unsigned long action,
- void *hcpu)
+static int cpuid_class_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
int err = 0;
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 4934890..69eb2fa 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -133,7 +133,7 @@ static void x86_of_pci_irq_disable(struct pci_dev *dev)
{
}
-void __cpuinit x86_of_pci_init(void)
+void x86_of_pci_init(void)
{
pcibios_enable_irq = x86_of_pci_irq_enable;
pcibios_disable_irq = x86_of_pci_irq_disable;
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index e65ddc6..5dd87a8 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -292,7 +292,6 @@ ENDPROC(start_cpu0)
* If cpu hotplug is not supported then this code can go in init section
* which will be freed later
*/
-__CPUINIT
ENTRY(startup_32_smp)
cld
movl $(__BOOT_DS),%eax
diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index b627746..573bcb3 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -108,9 +108,9 @@ EXPORT_SYMBOL(unlazy_fpu);
unsigned int mxcsr_feature_mask __read_mostly = 0xffffffffu;
unsigned int xstate_size;
EXPORT_SYMBOL_GPL(xstate_size);
-static struct i387_fxsave_struct fx_scratch __cpuinitdata;
+static struct i387_fxsave_struct fx_scratch;
-static void __cpuinit mxcsr_feature_mask_init(void)
+static void mxcsr_feature_mask_init(void)
{
unsigned long mask = 0;
@@ -124,7 +124,7 @@ static void __cpuinit mxcsr_feature_mask_init(void)
mxcsr_feature_mask &= mask;
}
-static void __cpuinit init_thread_xstate(void)
+static void init_thread_xstate(void)
{
/*
* Note that xstate_size might be overwriten later during
@@ -153,7 +153,7 @@ static void __cpuinit init_thread_xstate(void)
* into all processes.
*/
-void __cpuinit fpu_init(void)
+void fpu_init(void)
{
unsigned long cr0;
unsigned long cr4_mask = 0;
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 344faf8..4186755 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -119,7 +119,7 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
/*
* allocate per-cpu stacks for hardirq and for softirq processing
*/
-void __cpuinit irq_ctx_init(int cpu)
+void irq_ctx_init(int cpu)
{
union irq_ctx *irqctx;
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index cd6d9a5..a96d32c 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -320,7 +320,7 @@ static void kvm_guest_apic_eoi_write(u32 reg, u32 val)
apic_write(APIC_EOI, APIC_EOI_ACK);
}
-void __cpuinit kvm_guest_cpu_init(void)
+void kvm_guest_cpu_init(void)
{
if (!kvm_para_available())
return;
@@ -421,7 +421,7 @@ static void __init kvm_smp_prepare_boot_cpu(void)
native_smp_prepare_boot_cpu();
}
-static void __cpuinit kvm_guest_cpu_online(void *dummy)
+static void kvm_guest_cpu_online(void *dummy)
{
kvm_guest_cpu_init();
}
@@ -435,8 +435,8 @@ static void kvm_guest_cpu_offline(void *dummy)
apf_task_wake_all();
}
-static int __cpuinit kvm_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int kvm_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
int cpu = (unsigned long)hcpu;
switch (action) {
@@ -455,7 +455,7 @@ static int __cpuinit kvm_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata kvm_cpu_notifier = {
+static struct notifier_block kvm_cpu_notifier = {
.notifier_call = kvm_cpu_notify,
};
#endif
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index 1f354f4..1570e07 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -182,7 +182,7 @@ static void kvm_restore_sched_clock_state(void)
}
#ifdef CONFIG_X86_LOCAL_APIC
-static void __cpuinit kvm_setup_secondary_clock(void)
+static void kvm_setup_secondary_clock(void)
{
/*
* Now that the first cpu already had this clocksource initialized,
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 22db92b..15c9876 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -468,7 +468,7 @@ static struct syscore_ops mc_syscore_ops = {
.resume = mc_bp_resume,
};
-static __cpuinit int
+static int
mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
diff --git a/arch/x86/kernel/microcode_core_early.c b/arch/x86/kernel/microcode_core_early.c
index 86119f6..be7f851 100644
--- a/arch/x86/kernel/microcode_core_early.c
+++ b/arch/x86/kernel/microcode_core_early.c
@@ -41,7 +41,7 @@
*
* x86_vendor() gets vendor information directly through cpuid.
*/
-static int __cpuinit x86_vendor(void)
+static int x86_vendor(void)
{
u32 eax = 0x00000000;
u32 ebx, ecx = 0, edx;
@@ -57,7 +57,7 @@ static int __cpuinit x86_vendor(void)
return X86_VENDOR_UNKNOWN;
}
-static int __cpuinit x86_family(void)
+static int x86_family(void)
{
u32 eax = 0x00000001;
u32 ebx, ecx = 0, edx;
@@ -96,7 +96,7 @@ void __init load_ucode_bsp(void)
}
}
-void __cpuinit load_ucode_ap(void)
+void load_ucode_ap(void)
{
int vendor, x86;
diff --git a/arch/x86/kernel/microcode_intel_early.c b/arch/x86/kernel/microcode_intel_early.c
index dabef95..1575deb 100644
--- a/arch/x86/kernel/microcode_intel_early.c
+++ b/arch/x86/kernel/microcode_intel_early.c
@@ -34,7 +34,7 @@ struct mc_saved_data {
struct microcode_intel **mc_saved;
} mc_saved_data;
-static enum ucode_state __cpuinit
+static enum ucode_state
generic_load_microcode_early(struct microcode_intel **mc_saved_p,
unsigned int mc_saved_count,
struct ucode_cpu_info *uci)
@@ -69,7 +69,7 @@ out:
return state;
}
-static void __cpuinit
+static void
microcode_pointer(struct microcode_intel **mc_saved,
unsigned long *mc_saved_in_initrd,
unsigned long initrd_start, int mc_saved_count)
@@ -82,7 +82,7 @@ microcode_pointer(struct microcode_intel **mc_saved,
}
#ifdef CONFIG_X86_32
-static void __cpuinit
+static void
microcode_phys(struct microcode_intel **mc_saved_tmp,
struct mc_saved_data *mc_saved_data)
{
@@ -101,7 +101,7 @@ microcode_phys(struct microcode_intel **mc_saved_tmp,
}
#endif
-static enum ucode_state __cpuinit
+static enum ucode_state
load_microcode(struct mc_saved_data *mc_saved_data,
unsigned long *mc_saved_in_initrd,
unsigned long initrd_start,
@@ -375,7 +375,7 @@ do { \
#define native_wrmsr(msr, low, high) \
native_write_msr(msr, low, high);
-static int __cpuinit collect_cpu_info_early(struct ucode_cpu_info *uci)
+static int collect_cpu_info_early(struct ucode_cpu_info *uci)
{
unsigned int val[2];
u8 x86, x86_model;
@@ -584,7 +584,7 @@ scan_microcode(unsigned long start, unsigned long end,
/*
* Print ucode update info.
*/
-static void __cpuinit
+static void
print_ucode_info(struct ucode_cpu_info *uci, unsigned int date)
{
int cpu = smp_processor_id();
@@ -605,7 +605,7 @@ static int current_mc_date;
/*
* Print early updated ucode info after printk works. This is delayed info dump.
*/
-void __cpuinit show_ucode_info_early(void)
+void show_ucode_info_early(void)
{
struct ucode_cpu_info uci;
@@ -621,7 +621,7 @@ void __cpuinit show_ucode_info_early(void)
* mc_saved_data.mc_saved and delay printing microcode info in
* show_ucode_info_early() until printk() works.
*/
-static void __cpuinit print_ucode(struct ucode_cpu_info *uci)
+static void print_ucode(struct ucode_cpu_info *uci)
{
struct microcode_intel *mc_intel;
int *delay_ucode_info_p;
@@ -643,12 +643,12 @@ static void __cpuinit print_ucode(struct ucode_cpu_info *uci)
* Flush global tlb. We only do this in x86_64 where paging has been enabled
* already and PGE should be enabled as well.
*/
-static inline void __cpuinit flush_tlb_early(void)
+static inline void flush_tlb_early(void)
{
__native_flush_tlb_global_irq_disabled();
}
-static inline void __cpuinit print_ucode(struct ucode_cpu_info *uci)
+static inline void print_ucode(struct ucode_cpu_info *uci)
{
struct microcode_intel *mc_intel;
@@ -660,8 +660,8 @@ static inline void __cpuinit print_ucode(struct ucode_cpu_info *uci)
}
#endif
-static int __cpuinit apply_microcode_early(struct mc_saved_data *mc_saved_data,
- struct ucode_cpu_info *uci)
+static int apply_microcode_early(struct mc_saved_data *mc_saved_data,
+ struct ucode_cpu_info *uci)
{
struct microcode_intel *mc_intel;
unsigned int val[2];
@@ -763,7 +763,7 @@ load_ucode_intel_bsp(void)
#endif
}
-void __cpuinit load_ucode_intel_ap(void)
+void load_ucode_intel_ap(void)
{
struct mc_saved_data *mc_saved_data_p;
struct ucode_cpu_info uci;
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c
index ac861b8..f4c886d 100644
--- a/arch/x86/kernel/mmconf-fam10h_64.c
+++ b/arch/x86/kernel/mmconf-fam10h_64.c
@@ -24,14 +24,14 @@ struct pci_hostbridge_probe {
u32 device;
};
-static u64 __cpuinitdata fam10h_pci_mmconf_base;
+static u64 fam10h_pci_mmconf_base;
-static struct pci_hostbridge_probe pci_probes[] __cpuinitdata = {
+static struct pci_hostbridge_probe pci_probes[] = {
{ 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
{ 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
};
-static int __cpuinit cmp_range(const void *x1, const void *x2)
+static int cmp_range(const void *x1, const void *x2)
{
const struct range *r1 = x1;
const struct range *r2 = x2;
@@ -49,7 +49,7 @@ static int __cpuinit cmp_range(const void *x1, const void *x2)
/* need to avoid (0xfd<<32), (0xfe<<32), and (0xff<<32), ht used space */
#define FAM10H_PCI_MMCONF_BASE (0xfcULL<<32)
#define BASE_VALID(b) ((b) + MMCONF_SIZE <= (0xfdULL<<32) || (b) >= (1ULL<<40))
-static void __cpuinit get_fam10h_pci_mmconf_base(void)
+static void get_fam10h_pci_mmconf_base(void)
{
int i;
unsigned bus;
@@ -166,7 +166,7 @@ out:
fam10h_pci_mmconf_base = base;
}
-void __cpuinit fam10h_check_enable_mmcfg(void)
+void fam10h_check_enable_mmcfg(void)
{
u64 val;
u32 address;
@@ -230,7 +230,7 @@ static const struct dmi_system_id __initconst mmconf_dmi_table[] = {
{}
};
-/* Called from a __cpuinit function, but only on the BSP. */
+/* Called from a non __init function, but only on the BSP. */
void __ref check_enable_amd_mmconf_dmi(void)
{
dmi_check_system(mmconf_dmi_table);
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index ce13049..88458fa 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -200,7 +200,7 @@ static const struct file_operations msr_fops = {
.compat_ioctl = msr_ioctl,
};
-static int __cpuinit msr_device_create(int cpu)
+static int msr_device_create(int cpu)
{
struct device *dev;
@@ -214,8 +214,8 @@ static void msr_device_destroy(int cpu)
device_destroy(msr_class, MKDEV(MSR_MAJOR, cpu));
}
-static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int msr_class_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
int err = 0;
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 81a5f5e..83369e5 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -398,7 +398,7 @@ static void amd_e400_idle(void)
default_idle();
}
-void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
+void select_idle_routine(const struct cpuinfo_x86 *c)
{
#ifdef CONFIG_SMP
if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index e68709d..f8ec578 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -170,7 +170,7 @@ static struct resource bss_resource = {
#ifdef CONFIG_X86_32
/* cpu data as detected by the assembly code in head.S */
-struct cpuinfo_x86 new_cpu_data __cpuinitdata = {
+struct cpuinfo_x86 new_cpu_data = {
.wp_works_ok = -1,
};
/* common cpu data for all cpus */
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index bfd348e..aecc98a 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -130,7 +130,7 @@ atomic_t init_deasserted;
* Report back to the Boot Processor during boot time or to the caller processor
* during CPU online.
*/
-static void __cpuinit smp_callin(void)
+static void smp_callin(void)
{
int cpuid, phys_id;
unsigned long timeout;
@@ -237,7 +237,7 @@ static int enable_start_cpu0;
/*
* Activate a secondary processor.
*/
-notrace static void __cpuinit start_secondary(void *unused)
+static void notrace start_secondary(void *unused)
{
/*
* Don't put *anything* before cpu_init(), SMP booting is too
@@ -300,7 +300,7 @@ void __init smp_store_boot_cpu_info(void)
* The bootstrap kernel entry code has set these up. Save them for
* a given CPU
*/
-void __cpuinit smp_store_cpu_info(int id)
+void smp_store_cpu_info(int id)
{
struct cpuinfo_x86 *c = &cpu_data(id);
@@ -313,7 +313,7 @@ void __cpuinit smp_store_cpu_info(int id)
identify_secondary_cpu(c);
}
-static bool __cpuinit
+static bool
topology_sane(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o, const char *name)
{
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
@@ -330,7 +330,7 @@ do { \
cpumask_set_cpu((c2), cpu_##_m##_mask(c1)); \
} while (0)
-static bool __cpuinit match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
+static bool match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
{
if (cpu_has_topoext) {
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
@@ -348,7 +348,7 @@ static bool __cpuinit match_smt(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
return false;
}
-static bool __cpuinit match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
+static bool match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
{
int cpu1 = c->cpu_index, cpu2 = o->cpu_index;
@@ -359,7 +359,7 @@ static bool __cpuinit match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
return false;
}
-static bool __cpuinit match_mc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
+static bool match_mc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
{
if (c->phys_proc_id == o->phys_proc_id) {
if (cpu_has(c, X86_FEATURE_AMD_DCM))
@@ -370,7 +370,7 @@ static bool __cpuinit match_mc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)
return false;
}
-void __cpuinit set_cpu_sibling_map(int cpu)
+void set_cpu_sibling_map(int cpu)
{
bool has_smt = smp_num_siblings > 1;
bool has_mp = has_smt || boot_cpu_data.x86_max_cores > 1;
@@ -499,7 +499,7 @@ void __inquire_remote_apic(int apicid)
* INIT, INIT, STARTUP sequence will reset the chip hard for us, and this
* won't ... remember to clear down the APIC, etc later.
*/
-int __cpuinit
+int
wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)
{
unsigned long send_status, accept_status = 0;
@@ -533,7 +533,7 @@ wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)
return (send_status | accept_status);
}
-static int __cpuinit
+static int
wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
{
unsigned long send_status, accept_status = 0;
@@ -649,7 +649,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
}
/* reduce the number of lines printed when booting a large cpu count system */
-static void __cpuinit announce_cpu(int cpu, int apicid)
+static void announce_cpu(int cpu, int apicid)
{
static int current_node = -1;
int node = early_cpu_to_node(cpu);
@@ -691,7 +691,7 @@ static int wakeup_cpu0_nmi(unsigned int cmd, struct pt_regs *regs)
* We'll change this code in the future to wake up hard offlined CPU0 if
* real platform and request are available.
*/
-static int __cpuinit
+static int
wakeup_cpu_via_init_nmi(int cpu, unsigned long start_ip, int apicid,
int *cpu0_nmi_registered)
{
@@ -731,7 +731,7 @@ wakeup_cpu_via_init_nmi(int cpu, unsigned long start_ip, int apicid,
* Returns zero if CPU booted OK, else error code from
* ->wakeup_secondary_cpu.
*/
-static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
{
volatile u32 *trampoline_status =
(volatile u32 *) __va(real_mode_header->trampoline_status);
@@ -872,7 +872,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
return boot_error;
}
-int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
+int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int apicid = apic->cpu_present_to_apicid(cpu);
unsigned long flags;
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index f84fe00..088681d 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -319,8 +319,8 @@ static int tboot_wait_for_aps(int num_aps)
return !(atomic_read((atomic_t *)&tboot->num_in_wfs) == num_aps);
}
-static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
+ void *hcpu)
{
switch (action) {
case CPU_DYING:
@@ -333,7 +333,7 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block tboot_cpu_notifier __cpuinitdata =
+static struct notifier_block tboot_cpu_notifier =
{
.notifier_call = tboot_cpu_callback,
};
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 098b3cf..6ff4924 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -824,7 +824,7 @@ static void __init check_system_tsc_reliable(void)
* Make an educated guess if the TSC is trustworthy and synchronized
* over all CPUs.
*/
-__cpuinit int unsynchronized_tsc(void)
+int unsynchronized_tsc(void)
{
if (!cpu_has_tsc || tsc_unstable)
return 1;
@@ -1020,7 +1020,7 @@ void __init tsc_init(void)
* been calibrated. This assumes that CONSTANT_TSC applies to all
* cpus in the socket - this should be a safe assumption.
*/
-unsigned long __cpuinit calibrate_delay_is_known(void)
+unsigned long calibrate_delay_is_known(void)
{
int i, cpu = smp_processor_id();
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index fc25e60..adfdf56 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -25,24 +25,24 @@
* Entry/exit counters that make sure that both CPUs
* run the measurement code at once:
*/
-static __cpuinitdata atomic_t start_count;
-static __cpuinitdata atomic_t stop_count;
+static atomic_t start_count;
+static atomic_t stop_count;
/*
* We use a raw spinlock in this exceptional case, because
* we want to have the fastest, inlined, non-debug version
* of a critical section, to be able to prove TSC time-warps:
*/
-static __cpuinitdata arch_spinlock_t sync_lock = __ARCH_SPIN_LOCK_UNLOCKED;
+static arch_spinlock_t sync_lock = __ARCH_SPIN_LOCK_UNLOCKED;
-static __cpuinitdata cycles_t last_tsc;
-static __cpuinitdata cycles_t max_warp;
-static __cpuinitdata int nr_warps;
+static cycles_t last_tsc;
+static cycles_t max_warp;
+static int nr_warps;
/*
* TSC-warp measurement loop running on both CPUs:
*/
-static __cpuinit void check_tsc_warp(unsigned int timeout)
+static void check_tsc_warp(unsigned int timeout)
{
cycles_t start, now, prev, end;
int i;
@@ -121,7 +121,7 @@ static inline unsigned int loop_timeout(int cpu)
* Source CPU calls into this - it waits for the freshly booted
* target CPU to arrive and then starts the measurement:
*/
-void __cpuinit check_tsc_sync_source(int cpu)
+void check_tsc_sync_source(int cpu)
{
int cpus = 2;
@@ -187,7 +187,7 @@ void __cpuinit check_tsc_sync_source(int cpu)
/*
* Freshly booted CPUs call into this:
*/
-void __cpuinit check_tsc_sync_target(void)
+void check_tsc_sync_target(void)
{
int cpus = 2;
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 9a907a6..1f96f93 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -331,7 +331,7 @@ sigsegv:
* Assume __initcall executes before all user space. Hopefully kmod
* doesn't violate that. We'll find out if it does.
*/
-static void __cpuinit vsyscall_set_cpu(int cpu)
+static void vsyscall_set_cpu(int cpu)
{
unsigned long d;
unsigned long node = 0;
@@ -353,13 +353,13 @@ static void __cpuinit vsyscall_set_cpu(int cpu)
write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_PER_CPU, &d, DESCTYPE_S);
}
-static void __cpuinit cpu_vsyscall_init(void *arg)
+static void cpu_vsyscall_init(void *arg)
{
/* preemption should be already off */
vsyscall_set_cpu(raw_smp_processor_id());
}
-static int __cpuinit
+static int
cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
{
long cpu = (long)arg;
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 45a14db..5f24c71 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -25,7 +25,7 @@
#include <asm/iommu.h>
#include <asm/mach_traps.h>
-void __cpuinit x86_init_noop(void) { }
+void x86_init_noop(void) { }
void __init x86_init_uint_noop(unsigned int unused) { }
int __init iommu_init_noop(void) { return 0; }
void iommu_shutdown_noop(void) { }
@@ -85,7 +85,7 @@ struct x86_init_ops x86_init __initdata = {
},
};
-struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
+struct x86_cpuinit_ops x86_cpuinit = {
.early_percpu_clock_init = x86_init_noop,
.setup_percpu_clockev = setup_secondary_APIC_clock,
};
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index d6c28ac..422fd82 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -573,7 +573,7 @@ static void __init xstate_enable_boot_cpu(void)
* This is somewhat obfuscated due to the lack of powerful enough
* overrides for the section checks.
*/
-void __cpuinit xsave_init(void)
+void xsave_init(void)
{
static __refdata void (*next_func)(void) = xstate_enable_boot_cpu;
void (*this_func)(void);
@@ -594,7 +594,7 @@ static inline void __init eager_fpu_init_bp(void)
setup_init_fpu_buf();
}
-void __cpuinit eager_fpu_init(void)
+void eager_fpu_init(void)
{
static __refdata void (*boot_func)(void) = eager_fpu_init_bp;
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index dc0b727..0057a7a 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -410,9 +410,7 @@ out:
pr_warning("multiple CPUs still online, may miss events.\n");
}
-/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit,
- but this whole function is ifdefed CONFIG_HOTPLUG_CPU */
-static void __ref leave_uniprocessor(void)
+static void leave_uniprocessor(void)
{
int cpu;
int err;
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index a71c4e2..8bf93ba 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -60,7 +60,7 @@ s16 __apicid_to_node[MAX_LOCAL_APIC] = {
[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
};
-int __cpuinit numa_cpu_node(int cpu)
+int numa_cpu_node(int cpu)
{
int apicid = early_per_cpu(x86_cpu_to_apicid, cpu);
@@ -691,12 +691,12 @@ void __init init_cpu_to_node(void)
#ifndef CONFIG_DEBUG_PER_CPU_MAPS
# ifndef CONFIG_NUMA_EMU
-void __cpuinit numa_add_cpu(int cpu)
+void numa_add_cpu(int cpu)
{
cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
}
-void __cpuinit numa_remove_cpu(int cpu)
+void numa_remove_cpu(int cpu)
{
cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
}
@@ -763,17 +763,17 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable)
}
# ifndef CONFIG_NUMA_EMU
-static void __cpuinit numa_set_cpumask(int cpu, bool enable)
+static void numa_set_cpumask(int cpu, bool enable)
{
debug_cpumask_set_cpu(cpu, early_cpu_to_node(cpu), enable);
}
-void __cpuinit numa_add_cpu(int cpu)
+void numa_add_cpu(int cpu)
{
numa_set_cpumask(cpu, true);
}
-void __cpuinit numa_remove_cpu(int cpu)
+void numa_remove_cpu(int cpu)
{
numa_set_cpumask(cpu, false);
}
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index dbbbb47..a8f90ce 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -10,7 +10,7 @@
#include "numa_internal.h"
-static int emu_nid_to_phys[MAX_NUMNODES] __cpuinitdata;
+static int emu_nid_to_phys[MAX_NUMNODES];
static char *emu_cmdline __initdata;
void __init numa_emu_cmdline(char *str)
@@ -444,7 +444,7 @@ no_emu:
}
#ifndef CONFIG_DEBUG_PER_CPU_MAPS
-void __cpuinit numa_add_cpu(int cpu)
+void numa_add_cpu(int cpu)
{
int physnid, nid;
@@ -462,7 +462,7 @@ void __cpuinit numa_add_cpu(int cpu)
cpumask_set_cpu(cpu, node_to_cpumask_map[nid]);
}
-void __cpuinit numa_remove_cpu(int cpu)
+void numa_remove_cpu(int cpu)
{
int i;
@@ -470,7 +470,7 @@ void __cpuinit numa_remove_cpu(int cpu)
cpumask_clear_cpu(cpu, node_to_cpumask_map[i]);
}
#else /* !CONFIG_DEBUG_PER_CPU_MAPS */
-static void __cpuinit numa_set_cpumask(int cpu, bool enable)
+static void numa_set_cpumask(int cpu, bool enable)
{
int nid, physnid;
@@ -490,12 +490,12 @@ static void __cpuinit numa_set_cpumask(int cpu, bool enable)
}
}
-void __cpuinit numa_add_cpu(int cpu)
+void numa_add_cpu(int cpu)
{
numa_set_cpumask(cpu, true);
}
-void __cpuinit numa_remove_cpu(int cpu)
+void numa_remove_cpu(int cpu)
{
numa_set_cpumask(cpu, false);
}
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
index 410531d..90555bf 100644
--- a/arch/x86/mm/setup_nx.c
+++ b/arch/x86/mm/setup_nx.c
@@ -5,7 +5,7 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
-static int disable_nx __cpuinitdata;
+static int disable_nx;
/*
* noexec = on|off
@@ -29,7 +29,7 @@ static int __init noexec_setup(char *str)
}
early_param("noexec", noexec_setup);
-void __cpuinit x86_configure_nx(void)
+void x86_configure_nx(void)
{
if (cpu_has_nx && !disable_nx)
__supported_pte_mask |= _PAGE_NX;
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index e9e6ed5..a48be98 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -312,7 +312,7 @@ static int __init early_fill_mp_bus_info(void)
#define ENABLE_CF8_EXT_CFG (1ULL << 46)
-static void __cpuinit enable_pci_io_ecs(void *unused)
+static void enable_pci_io_ecs(void *unused)
{
u64 reg;
rdmsrl(MSR_AMD64_NB_CFG, reg);
@@ -322,8 +322,8 @@ static void __cpuinit enable_pci_io_ecs(void *unused)
}
}
-static int __cpuinit amd_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int amd_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
int cpu = (long)hcpu;
switch (action) {
@@ -337,7 +337,7 @@ static int __cpuinit amd_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata amd_cpu_notifier = {
+static struct notifier_block amd_cpu_notifier = {
.notifier_call = amd_cpu_notify,
};
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
index f8ab494..baec704 100644
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@ -134,7 +134,7 @@ static void __init sdv_arch_setup(void)
}
#ifdef CONFIG_X86_IO_APIC
-static void __cpuinit sdv_pci_init(void)
+static void sdv_pci_init(void)
{
x86_of_pci_init();
/* We can't set this earlier, because we need to calibrate the timer */
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index a0a0a43..47fe66f 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -65,7 +65,7 @@
* lapic (always-on,ARAT) ------ 150
*/
-__cpuinitdata enum mrst_timer_options mrst_timer_options;
+enum mrst_timer_options mrst_timer_options;
static u32 sfi_mtimer_usage[SFI_MTMR_MAX_NUM];
static struct sfi_timer_table_entry sfi_mtimer_array[SFI_MTMR_MAX_NUM];
@@ -248,7 +248,7 @@ static void __init mrst_time_init(void)
apbt_time_init();
}
-static void __cpuinit mrst_arch_setup(void)
+static void mrst_arch_setup(void)
{
if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
__mrst_cpu_chip = MRST_CPU_CHIP_PENWELL;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index db58b68..22bd4bd 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1719,8 +1719,8 @@ static void __init init_hvm_pv_info(void)
xen_domain_type = XEN_HVM_DOMAIN;
}
-static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int xen_hvm_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
int cpu = (long)hcpu;
switch (action) {
@@ -1738,7 +1738,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = {
+static struct notifier_block xen_hvm_cpu_notifier = {
.notifier_call = xen_hvm_cpu_notify,
};
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index c4874c0..38b3df4 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -503,7 +503,7 @@ static void __init fiddle_vdso(void)
#endif
}
-static int __cpuinit register_callback(unsigned type, const void *func)
+static int register_callback(unsigned type, const void *func)
{
struct callback_register callback = {
.type = type,
@@ -514,7 +514,7 @@ static int __cpuinit register_callback(unsigned type, const void *func)
return HYPERVISOR_callback_op(CALLBACKOP_register, &callback);
}
-void __cpuinit xen_enable_sysenter(void)
+void xen_enable_sysenter(void)
{
int ret;
unsigned sysenter_feature;
@@ -533,7 +533,7 @@ void __cpuinit xen_enable_sysenter(void)
setup_clear_cpu_cap(sysenter_feature);
}
-void __cpuinit xen_enable_syscall(void)
+void xen_enable_syscall(void)
{
#ifdef CONFIG_X86_64
int ret;
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 3d88499..e98f85f 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -65,7 +65,7 @@ static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static void __cpuinit cpu_bringup(void)
+static void cpu_bringup(void)
{
int cpu;
@@ -99,7 +99,7 @@ static void __cpuinit cpu_bringup(void)
wmb(); /* make sure everything is out */
}
-static void __cpuinit cpu_bringup_and_idle(void)
+static void cpu_bringup_and_idle(void)
{
cpu_bringup();
cpu_startup_entry(CPUHP_ONLINE);
@@ -329,7 +329,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
set_cpu_present(cpu, true);
}
-static int __cpuinit
+static int
cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
{
struct vcpu_guest_context *ctxt;
@@ -416,7 +416,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
return 0;
}
-static int __cpuinit xen_cpu_up(unsigned int cpu, struct task_struct *idle)
+static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
{
int rc;
@@ -489,7 +489,7 @@ static void xen_cpu_die(unsigned int cpu)
xen_teardown_timer(cpu);
}
-static void __cpuinit xen_play_dead(void) /* used only with HOTPLUG_CPU */
+static void xen_play_dead(void) /* used only with HOTPLUG_CPU */
{
play_dead_common();
HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
@@ -710,7 +710,7 @@ static void __init xen_hvm_smp_prepare_cpus(unsigned int max_cpus)
xen_init_lock_cpu(0);
}
-static int __cpuinit xen_hvm_cpu_up(unsigned int cpu, struct task_struct *tidle)
+static int xen_hvm_cpu_up(unsigned int cpu, struct task_struct *tidle)
{
int rc;
rc = native_cpu_up(cpu, tidle);
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index a40f850..cf3caee 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -361,7 +361,7 @@ static irqreturn_t dummy_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
-void __cpuinit xen_init_lock_cpu(int cpu)
+void xen_init_lock_cpu(int cpu)
{
int irq;
char *name;
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index a95b417..86782c5 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -73,7 +73,7 @@ static inline void xen_hvm_smp_init(void) {}
#ifdef CONFIG_PARAVIRT_SPINLOCKS
void __init xen_init_spinlocks(void);
-void __cpuinit xen_init_lock_cpu(int cpu);
+void xen_init_lock_cpu(int cpu);
void xen_uninit_lock_cpu(int cpu);
#else
static inline void xen_init_spinlocks(void)
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 23/32] x86: delete __cpuinit usage from all x86 files
2013-06-24 19:30 ` [PATCH 23/32] x86: delete __cpuinit usage from all x86 files Paul Gortmaker
@ 2013-06-24 19:37 ` Ingo Molnar
2013-06-24 19:57 ` Thomas Gleixner
2013-06-24 23:12 ` H. Peter Anvin
2 siblings, 0 replies; 88+ messages in thread
From: Ingo Molnar @ 2013-06-24 19:37 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86
* Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/x86 uses of the __cpuinit macros from
> all C files. x86 only had the one __CPUINIT used in assembly files,
> and it wasn't paired off with a .previous or a __FINIT, so we can
> delete it directly w/o any corresponding additional change there.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Thanks,
Ingo
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 23/32] x86: delete __cpuinit usage from all x86 files
2013-06-24 19:30 ` [PATCH 23/32] x86: delete __cpuinit usage from all x86 files Paul Gortmaker
2013-06-24 19:37 ` Ingo Molnar
@ 2013-06-24 19:57 ` Thomas Gleixner
2013-06-24 23:12 ` H. Peter Anvin
2 siblings, 0 replies; 88+ messages in thread
From: Thomas Gleixner @ 2013-06-24 19:57 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, Ingo Molnar, H. Peter Anvin, x86
On Mon, 24 Jun 2013, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/x86 uses of the __cpuinit macros from
> all C files. x86 only had the one __CPUINIT used in assembly files,
> and it wasn't paired off with a .previous or a __FINIT, so we can
> delete it directly w/o any corresponding additional change there.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 23/32] x86: delete __cpuinit usage from all x86 files
2013-06-24 19:30 ` [PATCH 23/32] x86: delete __cpuinit usage from all x86 files Paul Gortmaker
2013-06-24 19:37 ` Ingo Molnar
2013-06-24 19:57 ` Thomas Gleixner
@ 2013-06-24 23:12 ` H. Peter Anvin
2013-06-25 2:16 ` Paul Gortmaker
2 siblings, 1 reply; 88+ messages in thread
From: H. Peter Anvin @ 2013-06-24 23:12 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, x86
On 06/24/2013 12:30 PM, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> Note that some harmless section mismatch warnings may result, since
> notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> are flagged as __cpuinit -- so if we remove the __cpuinit from
> arch specific callers, we will also get section mismatch warnings.
> As an intermediate step, we intend to turn the linux/init.h cpuinit
> content into no-ops as early as possible, since that will get rid
> of these warnings. In any case, they are temporary and harmless.
>
> This removes all the arch/x86 uses of the __cpuinit macros from
> all C files. x86 only had the one __CPUINIT used in assembly files,
> and it wasn't paired off with a .previous or a __FINIT, so we can
> delete it directly w/o any corresponding additional change there.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: x86@kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Do you want me to carry this or are you planning to push the entire
thing as a single patchset?
-hpa
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 23/32] x86: delete __cpuinit usage from all x86 files
2013-06-24 23:12 ` H. Peter Anvin
@ 2013-06-25 2:16 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-25 2:16 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, x86
[Re: [PATCH 23/32] x86: delete __cpuinit usage from all x86 files] On 24/06/2013 (Mon 16:12) H. Peter Anvin wrote:
> On 06/24/2013 12:30 PM, Paul Gortmaker wrote:
> > The __cpuinit type of throwaway sections might have made sense
> > some time ago when RAM was more constrained, but now the savings
> > do not offset the cost and complications. For example, the fix in
> > commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> > is a good example of the nasty type of bugs that can be created
> > with improper use of the various __init prefixes.
> >
> > After a discussion on LKML[1] it was decided that cpuinit should go
> > the way of devinit and be phased out. Once all the users are gone,
> > we can then finally remove the macros themselves from linux/init.h.
> >
> > Note that some harmless section mismatch warnings may result, since
> > notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
> > are flagged as __cpuinit -- so if we remove the __cpuinit from
> > arch specific callers, we will also get section mismatch warnings.
> > As an intermediate step, we intend to turn the linux/init.h cpuinit
> > content into no-ops as early as possible, since that will get rid
> > of these warnings. In any case, they are temporary and harmless.
> >
> > This removes all the arch/x86 uses of the __cpuinit macros from
> > all C files. x86 only had the one __CPUINIT used in assembly files,
> > and it wasn't paired off with a .previous or a __FINIT, so we can
> > delete it directly w/o any corresponding additional change there.
> >
> > [1] https://lkml.org/lkml/2013/5/20/589
> >
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: Ingo Molnar <mingo@redhat.com>
> > Cc: "H. Peter Anvin" <hpa@zytor.com>
> > Cc: x86@kernel.org
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > ---
> >
>
> Acked-by: H. Peter Anvin <hpa@linux.intel.com>
>
> Do you want me to carry this or are you planning to push the entire
> thing as a single patchset?
Short answer -- I'll carry it unless you expect massive changes
still pending to arch/x86 (which I highly doubt) and really want
to carry it.
I'm fine with carrying most/all of it as a patch queue, however
some folks expected significant churn in their tree and wanted to
handle the conflicts/refreshes themselves. But I'm fine with keeping
things up to date with the latest linux-next and doing the trivial
refreshes on the series until the merge window closes out and the
remaining 99% of it goes in tree.
Paul.
--
>
> -hpa
>
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 24/32] clocksource+irqchip: delete __cpuinit usage from all related files
2013-06-24 19:30 ` Paul Gortmaker
` (26 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-24 19:56 ` Thomas Gleixner
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, John Stultz, Thomas Gleixner
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/clocksource and drivers/irqchip uses of
the __cpuinit macros from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: John Stultz <john.stultz@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/clocksource/arm_arch_timer.c | 8 ++++----
drivers/clocksource/exynos_mct.c | 4 ++--
drivers/clocksource/metag_generic.c | 6 +++---
drivers/clocksource/time-armada-370-xp.c | 4 ++--
drivers/clocksource/timer-marco.c | 4 ++--
drivers/irqchip/irq-gic.c | 8 ++++----
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 053d846..ffadd83 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -123,7 +123,7 @@ static int arch_timer_set_next_event_phys(unsigned long evt,
return 0;
}
-static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
+static int arch_timer_setup(struct clock_event_device *clk)
{
clk->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP;
clk->name = "arch_sys_timer";
@@ -221,7 +221,7 @@ struct timecounter *arch_timer_get_timecounter(void)
return &timecounter;
}
-static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
+static void arch_timer_stop(struct clock_event_device *clk)
{
pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n",
clk->irq, smp_processor_id());
@@ -237,7 +237,7 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk);
}
-static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
+static int arch_timer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
/*
@@ -256,7 +256,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block arch_timer_cpu_nb __cpuinitdata = {
+static struct notifier_block arch_timer_cpu_nb = {
.notifier_call = arch_timer_cpu_notify,
};
diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index a704804..b2bbc41 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -400,7 +400,7 @@ static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static int __cpuinit exynos4_local_timer_setup(struct clock_event_device *evt)
+static int exynos4_local_timer_setup(struct clock_event_device *evt)
{
struct mct_clock_event_device *mevt;
unsigned int cpu = smp_processor_id();
@@ -448,7 +448,7 @@ static void exynos4_local_timer_stop(struct clock_event_device *evt)
disable_percpu_irq(mct_irqs[MCT_L0_IRQ]);
}
-static struct local_timer_ops exynos4_mct_tick_ops __cpuinitdata = {
+static struct local_timer_ops exynos4_mct_tick_ops = {
.setup = exynos4_local_timer_setup,
.stop = exynos4_local_timer_stop,
};
diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
index 6722f0e..9e4db41 100644
--- a/drivers/clocksource/metag_generic.c
+++ b/drivers/clocksource/metag_generic.c
@@ -109,7 +109,7 @@ unsigned long long sched_clock(void)
return ticks << HARDWARE_TO_NS_SHIFT;
}
-static void __cpuinit arch_timer_setup(unsigned int cpu)
+static void arch_timer_setup(unsigned int cpu)
{
unsigned int txdivtime;
struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
@@ -154,7 +154,7 @@ static void __cpuinit arch_timer_setup(unsigned int cpu)
}
}
-static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
+static int arch_timer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
int cpu = (long)hcpu;
@@ -169,7 +169,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata arch_timer_cpu_nb = {
+static struct notifier_block arch_timer_cpu_nb = {
.notifier_call = arch_timer_cpu_notify,
};
diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index efdca32..1b04b7e 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -167,7 +167,7 @@ static irqreturn_t armada_370_xp_timer_interrupt(int irq, void *dev_id)
/*
* Setup the local clock events for a CPU.
*/
-static int __cpuinit armada_370_xp_timer_setup(struct clock_event_device *evt)
+static int armada_370_xp_timer_setup(struct clock_event_device *evt)
{
u32 u;
int cpu = smp_processor_id();
@@ -205,7 +205,7 @@ static void armada_370_xp_timer_stop(struct clock_event_device *evt)
disable_percpu_irq(evt->irq);
}
-static struct local_timer_ops armada_370_xp_local_timer_ops __cpuinitdata = {
+static struct local_timer_ops armada_370_xp_local_timer_ops = {
.setup = armada_370_xp_timer_setup,
.stop = armada_370_xp_timer_stop,
};
diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index e5dc912..62876ba 100644
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -184,7 +184,7 @@ static struct irqaction sirfsoc_timer1_irq = {
.handler = sirfsoc_timer_interrupt,
};
-static int __cpuinit sirfsoc_local_timer_setup(struct clock_event_device *ce)
+static int sirfsoc_local_timer_setup(struct clock_event_device *ce)
{
/* Use existing clock_event for cpu 0 */
if (!smp_processor_id())
@@ -216,7 +216,7 @@ static void sirfsoc_local_timer_stop(struct clock_event_device *ce)
remove_irq(sirfsoc_timer1_irq.irq, &sirfsoc_timer1_irq);
}
-static struct local_timer_ops sirfsoc_local_timer_ops __cpuinitdata = {
+static struct local_timer_ops sirfsoc_local_timer_ops = {
.setup = sirfsoc_local_timer_setup,
.stop = sirfsoc_local_timer_stop,
};
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 19ceaa6..ee7c503 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -414,7 +414,7 @@ static void __init gic_dist_init(struct gic_chip_data *gic)
writel_relaxed(1, base + GIC_DIST_CTRL);
}
-static void __cpuinit gic_cpu_init(struct gic_chip_data *gic)
+static void gic_cpu_init(struct gic_chip_data *gic)
{
void __iomem *dist_base = gic_data_dist_base(gic);
void __iomem *base = gic_data_cpu_base(gic);
@@ -702,8 +702,8 @@ static int gic_irq_domain_xlate(struct irq_domain *d,
}
#ifdef CONFIG_SMP
-static int __cpuinit gic_secondary_init(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int gic_secondary_init(struct notifier_block *nfb, unsigned long action,
+ void *hcpu)
{
if (action == CPU_STARTING || action == CPU_STARTING_FROZEN)
gic_cpu_init(&gic_data[0]);
@@ -714,7 +714,7 @@ static int __cpuinit gic_secondary_init(struct notifier_block *nfb,
* Notifier for enabling the GIC CPU interface. Set an arbitrarily high
* priority because the GIC needs to be up before the ARM generic timers.
*/
-static struct notifier_block __cpuinitdata gic_cpu_notifier = {
+static struct notifier_block gic_cpu_notifier = {
.notifier_call = gic_secondary_init,
.priority = 100,
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 24/32] clocksource+irqchip: delete __cpuinit usage from all related files
2013-06-24 19:30 ` [PATCH 24/32] clocksource+irqchip: delete __cpuinit usage from all related files Paul Gortmaker
@ 2013-06-24 19:56 ` Thomas Gleixner
0 siblings, 0 replies; 88+ messages in thread
From: Thomas Gleixner @ 2013-06-24 19:56 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, John Stultz
On Mon, 24 Jun 2013, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> This removes all the drivers/clocksource and drivers/irqchip uses of
> the __cpuinit macros from all C files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Rafael J. Wysocki, Viresh Kumar, cpufreq,
linux-pm
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/cpufreq uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/cpufreq/cpufreq.c | 4 ++--
drivers/cpufreq/cpufreq_stats.c | 4 ++--
drivers/cpufreq/dbx500-cpufreq.c | 2 +-
drivers/cpufreq/intel_pstate.c | 4 ++--
drivers/cpufreq/longhaul.c | 6 +++---
drivers/cpufreq/longhaul.h | 26 +++++++++++++-------------
drivers/cpufreq/longrun.c | 8 ++++----
drivers/cpufreq/omap-cpufreq.c | 2 +-
drivers/cpufreq/powernow-k7.c | 8 ++++----
drivers/cpufreq/powernow-k8.c | 6 +++---
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index f8c2860..5687d28 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1900,8 +1900,8 @@ no_policy:
}
EXPORT_SYMBOL(cpufreq_update_policy);
-static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int cpufreq_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
struct device *dev;
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index fb65dec..ff50b0c 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -306,7 +306,7 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
}
static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
- unsigned long val, void *data)
+ unsigned long val, void *data)
{
struct cpufreq_freqs *freq = data;
struct cpufreq_stats *stat;
@@ -341,7 +341,7 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
return 0;
}
-static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 6ec6539..8c005ac 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -82,7 +82,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
return freq_table[i].frequency;
}
-static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
+static int dbx500_cpufreq_init(struct cpufreq_policy *policy)
{
int res;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 07f2840..b012d76 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -617,7 +617,7 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy)
return 0;
}
-static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
+static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
{
int cpu = policy->cpu;
@@ -627,7 +627,7 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
return 0;
}
-static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)
+static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
{
int rc, min_pstate, max_pstate;
struct cpudata *cpu;
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index b6a0a7a..8c49261 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -422,7 +422,7 @@ static int guess_fsb(int mult)
}
-static int __cpuinit longhaul_get_ranges(void)
+static int longhaul_get_ranges(void)
{
unsigned int i, j, k = 0;
unsigned int ratio;
@@ -526,7 +526,7 @@ static int __cpuinit longhaul_get_ranges(void)
}
-static void __cpuinit longhaul_setup_voltagescaling(void)
+static void longhaul_setup_voltagescaling(void)
{
union msr_longhaul longhaul;
struct mV_pos minvid, maxvid, vid;
@@ -780,7 +780,7 @@ static int longhaul_setup_southbridge(void)
return 0;
}
-static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)
+static int longhaul_cpu_init(struct cpufreq_policy *policy)
{
struct cpuinfo_x86 *c = &cpu_data(0);
char *cpuname = NULL;
diff --git a/drivers/cpufreq/longhaul.h b/drivers/cpufreq/longhaul.h
index e2dc436..1928b92 100644
--- a/drivers/cpufreq/longhaul.h
+++ b/drivers/cpufreq/longhaul.h
@@ -56,7 +56,7 @@ union msr_longhaul {
/*
* VIA C3 Samuel 1 & Samuel 2 (stepping 0)
*/
-static const int __cpuinitconst samuel1_mults[16] = {
+static const int samuel1_mults[16] = {
-1, /* 0000 -> RESERVED */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -75,7 +75,7 @@ static const int __cpuinitconst samuel1_mults[16] = {
-1, /* 1111 -> RESERVED */
};
-static const int __cpuinitconst samuel1_eblcr[16] = {
+static const int samuel1_eblcr[16] = {
50, /* 0000 -> RESERVED */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -97,7 +97,7 @@ static const int __cpuinitconst samuel1_eblcr[16] = {
/*
* VIA C3 Samuel2 Stepping 1->15
*/
-static const int __cpuinitconst samuel2_eblcr[16] = {
+static const int samuel2_eblcr[16] = {
50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -119,7 +119,7 @@ static const int __cpuinitconst samuel2_eblcr[16] = {
/*
* VIA C3 Ezra
*/
-static const int __cpuinitconst ezra_mults[16] = {
+static const int ezra_mults[16] = {
100, /* 0000 -> 10.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -138,7 +138,7 @@ static const int __cpuinitconst ezra_mults[16] = {
120, /* 1111 -> 12.0x */
};
-static const int __cpuinitconst ezra_eblcr[16] = {
+static const int ezra_eblcr[16] = {
50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -160,7 +160,7 @@ static const int __cpuinitconst ezra_eblcr[16] = {
/*
* VIA C3 (Ezra-T) [C5M].
*/
-static const int __cpuinitconst ezrat_mults[32] = {
+static const int ezrat_mults[32] = {
100, /* 0000 -> 10.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -196,7 +196,7 @@ static const int __cpuinitconst ezrat_mults[32] = {
-1, /* 1111 -> RESERVED (12.0x) */
};
-static const int __cpuinitconst ezrat_eblcr[32] = {
+static const int ezrat_eblcr[32] = {
50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -235,7 +235,7 @@ static const int __cpuinitconst ezrat_eblcr[32] = {
/*
* VIA C3 Nehemiah */
-static const int __cpuinitconst nehemiah_mults[32] = {
+static const int nehemiah_mults[32] = {
100, /* 0000 -> 10.0x */
-1, /* 0001 -> 16.0x */
40, /* 0010 -> 4.0x */
@@ -270,7 +270,7 @@ static const int __cpuinitconst nehemiah_mults[32] = {
-1, /* 1111 -> 12.0x */
};
-static const int __cpuinitconst nehemiah_eblcr[32] = {
+static const int nehemiah_eblcr[32] = {
50, /* 0000 -> 5.0x */
160, /* 0001 -> 16.0x */
40, /* 0010 -> 4.0x */
@@ -315,7 +315,7 @@ struct mV_pos {
unsigned short pos;
};
-static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
+static const struct mV_pos vrm85_mV[32] = {
{1250, 8}, {1200, 6}, {1150, 4}, {1100, 2},
{1050, 0}, {1800, 30}, {1750, 28}, {1700, 26},
{1650, 24}, {1600, 22}, {1550, 20}, {1500, 18},
@@ -326,14 +326,14 @@ static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
{1475, 17}, {1425, 15}, {1375, 13}, {1325, 11}
};
-static const unsigned char __cpuinitconst mV_vrm85[32] = {
+static const unsigned char mV_vrm85[32] = {
0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11,
0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d,
0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19,
0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15
};
-static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
+static const struct mV_pos mobilevrm_mV[32] = {
{1750, 31}, {1700, 30}, {1650, 29}, {1600, 28},
{1550, 27}, {1500, 26}, {1450, 25}, {1400, 24},
{1350, 23}, {1300, 22}, {1250, 21}, {1200, 20},
@@ -344,7 +344,7 @@ static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
{675, 3}, {650, 2}, {625, 1}, {600, 0}
};
-static const unsigned char __cpuinitconst mV_mobilevrm[32] = {
+static const unsigned char mV_mobilevrm[32] = {
0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c
index 8bc9f5f..7ad792d 100644
--- a/drivers/cpufreq/longrun.c
+++ b/drivers/cpufreq/longrun.c
@@ -33,7 +33,7 @@ static unsigned int longrun_low_freq, longrun_high_freq;
* Reads the current LongRun policy by access to MSR_TMTA_LONGRUN_FLAGS
* and MSR_TMTA_LONGRUN_CTRL
*/
-static void __cpuinit longrun_get_policy(struct cpufreq_policy *policy)
+static void longrun_get_policy(struct cpufreq_policy *policy)
{
u32 msr_lo, msr_hi;
@@ -163,8 +163,8 @@ static unsigned int longrun_get(unsigned int cpu)
* TMTA rules:
* performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
*/
-static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
- unsigned int *high_freq)
+static int longrun_determine_freqs(unsigned int *low_freq,
+ unsigned int *high_freq)
{
u32 msr_lo, msr_hi;
u32 save_lo, save_hi;
@@ -256,7 +256,7 @@ static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
}
-static int __cpuinit longrun_cpu_init(struct cpufreq_policy *policy)
+static int longrun_cpu_init(struct cpufreq_policy *policy)
{
int result = 0;
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 0279d18..4b81d3e 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -165,7 +165,7 @@ static inline void freq_table_free(void)
opp_free_cpufreq_table(mpu_dev, &freq_table);
}
-static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
+static int omap_cpu_init(struct cpufreq_policy *policy)
{
int result = 0;
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index b9f80b7..9558708 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -563,7 +563,7 @@ static int powernow_verify(struct cpufreq_policy *policy)
* We will then get the same kind of behaviour already tested under
* the "well-known" other OS.
*/
-static int __cpuinit fixup_sgtc(void)
+static int fixup_sgtc(void)
{
unsigned int sgtc;
unsigned int m;
@@ -597,7 +597,7 @@ static unsigned int powernow_get(unsigned int cpu)
}
-static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
+static int acer_cpufreq_pst(const struct dmi_system_id *d)
{
printk(KERN_WARNING PFX
"%s laptop with broken PST tables in BIOS detected.\n",
@@ -615,7 +615,7 @@ static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
* A BIOS update is all that can save them.
* Mention this, and disable cpufreq.
*/
-static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
+static struct dmi_system_id powernow_dmi_table[] = {
{
.callback = acer_cpufreq_pst,
.ident = "Acer Aspire",
@@ -627,7 +627,7 @@ static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
{ }
};
-static int __cpuinit powernow_cpu_init(struct cpufreq_policy *policy)
+static int powernow_cpu_init(struct cpufreq_policy *policy)
{
union msr_fidvidstatus fidvidstatus;
int result;
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 51343a1..c71907f 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1069,7 +1069,7 @@ struct init_on_cpu {
int rc;
};
-static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
+static void powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
{
struct init_on_cpu *init_on_cpu = _init_on_cpu;
@@ -1096,7 +1096,7 @@ static const char missing_pss_msg[] =
FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
/* 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;
struct init_on_cpu init_on_cpu;
@@ -1263,7 +1263,7 @@ static void __request_acpi_cpufreq(void)
}
/* driver entry point for init */
-static int __cpuinit powernowk8_init(void)
+static int powernowk8_init(void)
{
unsigned int i, supported_cpus = 0;
int ret;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Rafael J. Wysocki, Viresh Kumar, cpufreq,
linux-pm
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/cpufreq uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/cpufreq/cpufreq.c | 4 ++--
drivers/cpufreq/cpufreq_stats.c | 4 ++--
drivers/cpufreq/dbx500-cpufreq.c | 2 +-
drivers/cpufreq/intel_pstate.c | 4 ++--
drivers/cpufreq/longhaul.c | 6 +++---
drivers/cpufreq/longhaul.h | 26 +++++++++++++-------------
drivers/cpufreq/longrun.c | 8 ++++----
drivers/cpufreq/omap-cpufreq.c | 2 +-
drivers/cpufreq/powernow-k7.c | 8 ++++----
drivers/cpufreq/powernow-k8.c | 6 +++---
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index f8c2860..5687d28 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1900,8 +1900,8 @@ no_policy:
}
EXPORT_SYMBOL(cpufreq_update_policy);
-static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int cpufreq_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
struct device *dev;
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index fb65dec..ff50b0c 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -306,7 +306,7 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
}
static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
- unsigned long val, void *data)
+ unsigned long val, void *data)
{
struct cpufreq_freqs *freq = data;
struct cpufreq_stats *stat;
@@ -341,7 +341,7 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
return 0;
}
-static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
index 6ec6539..8c005ac 100644
--- a/drivers/cpufreq/dbx500-cpufreq.c
+++ b/drivers/cpufreq/dbx500-cpufreq.c
@@ -82,7 +82,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
return freq_table[i].frequency;
}
-static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
+static int dbx500_cpufreq_init(struct cpufreq_policy *policy)
{
int res;
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 07f2840..b012d76 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -617,7 +617,7 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy)
return 0;
}
-static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
+static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
{
int cpu = policy->cpu;
@@ -627,7 +627,7 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
return 0;
}
-static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)
+static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
{
int rc, min_pstate, max_pstate;
struct cpudata *cpu;
diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
index b6a0a7a..8c49261 100644
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@ -422,7 +422,7 @@ static int guess_fsb(int mult)
}
-static int __cpuinit longhaul_get_ranges(void)
+static int longhaul_get_ranges(void)
{
unsigned int i, j, k = 0;
unsigned int ratio;
@@ -526,7 +526,7 @@ static int __cpuinit longhaul_get_ranges(void)
}
-static void __cpuinit longhaul_setup_voltagescaling(void)
+static void longhaul_setup_voltagescaling(void)
{
union msr_longhaul longhaul;
struct mV_pos minvid, maxvid, vid;
@@ -780,7 +780,7 @@ static int longhaul_setup_southbridge(void)
return 0;
}
-static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)
+static int longhaul_cpu_init(struct cpufreq_policy *policy)
{
struct cpuinfo_x86 *c = &cpu_data(0);
char *cpuname = NULL;
diff --git a/drivers/cpufreq/longhaul.h b/drivers/cpufreq/longhaul.h
index e2dc436..1928b92 100644
--- a/drivers/cpufreq/longhaul.h
+++ b/drivers/cpufreq/longhaul.h
@@ -56,7 +56,7 @@ union msr_longhaul {
/*
* VIA C3 Samuel 1 & Samuel 2 (stepping 0)
*/
-static const int __cpuinitconst samuel1_mults[16] = {
+static const int samuel1_mults[16] = {
-1, /* 0000 -> RESERVED */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -75,7 +75,7 @@ static const int __cpuinitconst samuel1_mults[16] = {
-1, /* 1111 -> RESERVED */
};
-static const int __cpuinitconst samuel1_eblcr[16] = {
+static const int samuel1_eblcr[16] = {
50, /* 0000 -> RESERVED */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -97,7 +97,7 @@ static const int __cpuinitconst samuel1_eblcr[16] = {
/*
* VIA C3 Samuel2 Stepping 1->15
*/
-static const int __cpuinitconst samuel2_eblcr[16] = {
+static const int samuel2_eblcr[16] = {
50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -119,7 +119,7 @@ static const int __cpuinitconst samuel2_eblcr[16] = {
/*
* VIA C3 Ezra
*/
-static const int __cpuinitconst ezra_mults[16] = {
+static const int ezra_mults[16] = {
100, /* 0000 -> 10.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -138,7 +138,7 @@ static const int __cpuinitconst ezra_mults[16] = {
120, /* 1111 -> 12.0x */
};
-static const int __cpuinitconst ezra_eblcr[16] = {
+static const int ezra_eblcr[16] = {
50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -160,7 +160,7 @@ static const int __cpuinitconst ezra_eblcr[16] = {
/*
* VIA C3 (Ezra-T) [C5M].
*/
-static const int __cpuinitconst ezrat_mults[32] = {
+static const int ezrat_mults[32] = {
100, /* 0000 -> 10.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -196,7 +196,7 @@ static const int __cpuinitconst ezrat_mults[32] = {
-1, /* 1111 -> RESERVED (12.0x) */
};
-static const int __cpuinitconst ezrat_eblcr[32] = {
+static const int ezrat_eblcr[32] = {
50, /* 0000 -> 5.0x */
30, /* 0001 -> 3.0x */
40, /* 0010 -> 4.0x */
@@ -235,7 +235,7 @@ static const int __cpuinitconst ezrat_eblcr[32] = {
/*
* VIA C3 Nehemiah */
-static const int __cpuinitconst nehemiah_mults[32] = {
+static const int nehemiah_mults[32] = {
100, /* 0000 -> 10.0x */
-1, /* 0001 -> 16.0x */
40, /* 0010 -> 4.0x */
@@ -270,7 +270,7 @@ static const int __cpuinitconst nehemiah_mults[32] = {
-1, /* 1111 -> 12.0x */
};
-static const int __cpuinitconst nehemiah_eblcr[32] = {
+static const int nehemiah_eblcr[32] = {
50, /* 0000 -> 5.0x */
160, /* 0001 -> 16.0x */
40, /* 0010 -> 4.0x */
@@ -315,7 +315,7 @@ struct mV_pos {
unsigned short pos;
};
-static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
+static const struct mV_pos vrm85_mV[32] = {
{1250, 8}, {1200, 6}, {1150, 4}, {1100, 2},
{1050, 0}, {1800, 30}, {1750, 28}, {1700, 26},
{1650, 24}, {1600, 22}, {1550, 20}, {1500, 18},
@@ -326,14 +326,14 @@ static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
{1475, 17}, {1425, 15}, {1375, 13}, {1325, 11}
};
-static const unsigned char __cpuinitconst mV_vrm85[32] = {
+static const unsigned char mV_vrm85[32] = {
0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11,
0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d,
0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19,
0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15
};
-static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
+static const struct mV_pos mobilevrm_mV[32] = {
{1750, 31}, {1700, 30}, {1650, 29}, {1600, 28},
{1550, 27}, {1500, 26}, {1450, 25}, {1400, 24},
{1350, 23}, {1300, 22}, {1250, 21}, {1200, 20},
@@ -344,7 +344,7 @@ static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
{675, 3}, {650, 2}, {625, 1}, {600, 0}
};
-static const unsigned char __cpuinitconst mV_mobilevrm[32] = {
+static const unsigned char mV_mobilevrm[32] = {
0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c
index 8bc9f5f..7ad792d 100644
--- a/drivers/cpufreq/longrun.c
+++ b/drivers/cpufreq/longrun.c
@@ -33,7 +33,7 @@ static unsigned int longrun_low_freq, longrun_high_freq;
* Reads the current LongRun policy by access to MSR_TMTA_LONGRUN_FLAGS
* and MSR_TMTA_LONGRUN_CTRL
*/
-static void __cpuinit longrun_get_policy(struct cpufreq_policy *policy)
+static void longrun_get_policy(struct cpufreq_policy *policy)
{
u32 msr_lo, msr_hi;
@@ -163,8 +163,8 @@ static unsigned int longrun_get(unsigned int cpu)
* TMTA rules:
* performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
*/
-static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
- unsigned int *high_freq)
+static int longrun_determine_freqs(unsigned int *low_freq,
+ unsigned int *high_freq)
{
u32 msr_lo, msr_hi;
u32 save_lo, save_hi;
@@ -256,7 +256,7 @@ static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
}
-static int __cpuinit longrun_cpu_init(struct cpufreq_policy *policy)
+static int longrun_cpu_init(struct cpufreq_policy *policy)
{
int result = 0;
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
index 0279d18..4b81d3e 100644
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@ -165,7 +165,7 @@ static inline void freq_table_free(void)
opp_free_cpufreq_table(mpu_dev, &freq_table);
}
-static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
+static int omap_cpu_init(struct cpufreq_policy *policy)
{
int result = 0;
diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
index b9f80b7..9558708 100644
--- a/drivers/cpufreq/powernow-k7.c
+++ b/drivers/cpufreq/powernow-k7.c
@@ -563,7 +563,7 @@ static int powernow_verify(struct cpufreq_policy *policy)
* We will then get the same kind of behaviour already tested under
* the "well-known" other OS.
*/
-static int __cpuinit fixup_sgtc(void)
+static int fixup_sgtc(void)
{
unsigned int sgtc;
unsigned int m;
@@ -597,7 +597,7 @@ static unsigned int powernow_get(unsigned int cpu)
}
-static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
+static int acer_cpufreq_pst(const struct dmi_system_id *d)
{
printk(KERN_WARNING PFX
"%s laptop with broken PST tables in BIOS detected.\n",
@@ -615,7 +615,7 @@ static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
* A BIOS update is all that can save them.
* Mention this, and disable cpufreq.
*/
-static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
+static struct dmi_system_id powernow_dmi_table[] = {
{
.callback = acer_cpufreq_pst,
.ident = "Acer Aspire",
@@ -627,7 +627,7 @@ static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
{ }
};
-static int __cpuinit powernow_cpu_init(struct cpufreq_policy *policy)
+static int powernow_cpu_init(struct cpufreq_policy *policy)
{
union msr_fidvidstatus fidvidstatus;
int result;
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 51343a1..c71907f 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1069,7 +1069,7 @@ struct init_on_cpu {
int rc;
};
-static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
+static void powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
{
struct init_on_cpu *init_on_cpu = _init_on_cpu;
@@ -1096,7 +1096,7 @@ static const char missing_pss_msg[] =
FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
/* 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;
struct init_on_cpu init_on_cpu;
@@ -1263,7 +1263,7 @@ static void __request_acpi_cpufreq(void)
}
/* driver entry point for init */
-static int __cpuinit powernowk8_init(void)
+static int powernowk8_init(void)
{
unsigned int i, supported_cpus = 0;
int ret;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-24 19:30 ` Paul Gortmaker
(?)
@ 2013-06-24 22:42 ` Dirk Brandewie
-1 siblings, 0 replies; 88+ messages in thread
From: Dirk Brandewie @ 2013-06-24 22:42 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel, Rafael J. Wysocki, Viresh Kumar, cpufreq, linux-pm,
dirk.brandewie
On 06/24/2013 12:30 PM, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> This removes all the drivers/cpufreq uses of the __cpuinit macros
> from all C files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
For the intel_pstate portion
Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
> drivers/cpufreq/cpufreq.c | 4 ++--
> drivers/cpufreq/cpufreq_stats.c | 4 ++--
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 ++--
> drivers/cpufreq/longhaul.c | 6 +++---
> drivers/cpufreq/longhaul.h | 26 +++++++++++++-------------
> drivers/cpufreq/longrun.c | 8 ++++----
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++++----
> drivers/cpufreq/powernow-k8.c | 6 +++---
> 10 files changed, 35 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index f8c2860..5687d28 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -1900,8 +1900,8 @@ no_policy:
> }
> EXPORT_SYMBOL(cpufreq_update_policy);
>
> -static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
> - unsigned long action, void *hcpu)
> +static int cpufreq_cpu_callback(struct notifier_block *nfb,
> + unsigned long action, void *hcpu)
> {
> unsigned int cpu = (unsigned long)hcpu;
> struct device *dev;
> diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
> index fb65dec..ff50b0c 100644
> --- a/drivers/cpufreq/cpufreq_stats.c
> +++ b/drivers/cpufreq/cpufreq_stats.c
> @@ -306,7 +306,7 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
> }
>
> static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
> - unsigned long val, void *data)
> + unsigned long val, void *data)
> {
> struct cpufreq_freqs *freq = data;
> struct cpufreq_stats *stat;
> @@ -341,7 +341,7 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
> return 0;
> }
>
> -static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
> +static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
> unsigned long action,
> void *hcpu)
> {
> diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
> index 6ec6539..8c005ac 100644
> --- a/drivers/cpufreq/dbx500-cpufreq.c
> +++ b/drivers/cpufreq/dbx500-cpufreq.c
> @@ -82,7 +82,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
> return freq_table[i].frequency;
> }
>
> -static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
> +static int dbx500_cpufreq_init(struct cpufreq_policy *policy)
> {
> int res;
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 07f2840..b012d76 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -617,7 +617,7 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy)
> return 0;
> }
>
> -static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> +static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> {
> int cpu = policy->cpu;
>
> @@ -627,7 +627,7 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> return 0;
> }
>
> -static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)
> +static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
> {
> int rc, min_pstate, max_pstate;
> struct cpudata *cpu;
> diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
> index b6a0a7a..8c49261 100644
> --- a/drivers/cpufreq/longhaul.c
> +++ b/drivers/cpufreq/longhaul.c
> @@ -422,7 +422,7 @@ static int guess_fsb(int mult)
> }
>
>
> -static int __cpuinit longhaul_get_ranges(void)
> +static int longhaul_get_ranges(void)
> {
> unsigned int i, j, k = 0;
> unsigned int ratio;
> @@ -526,7 +526,7 @@ static int __cpuinit longhaul_get_ranges(void)
> }
>
>
> -static void __cpuinit longhaul_setup_voltagescaling(void)
> +static void longhaul_setup_voltagescaling(void)
> {
> union msr_longhaul longhaul;
> struct mV_pos minvid, maxvid, vid;
> @@ -780,7 +780,7 @@ static int longhaul_setup_southbridge(void)
> return 0;
> }
>
> -static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)
> +static int longhaul_cpu_init(struct cpufreq_policy *policy)
> {
> struct cpuinfo_x86 *c = &cpu_data(0);
> char *cpuname = NULL;
> diff --git a/drivers/cpufreq/longhaul.h b/drivers/cpufreq/longhaul.h
> index e2dc436..1928b92 100644
> --- a/drivers/cpufreq/longhaul.h
> +++ b/drivers/cpufreq/longhaul.h
> @@ -56,7 +56,7 @@ union msr_longhaul {
> /*
> * VIA C3 Samuel 1 & Samuel 2 (stepping 0)
> */
> -static const int __cpuinitconst samuel1_mults[16] = {
> +static const int samuel1_mults[16] = {
> -1, /* 0000 -> RESERVED */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -75,7 +75,7 @@ static const int __cpuinitconst samuel1_mults[16] = {
> -1, /* 1111 -> RESERVED */
> };
>
> -static const int __cpuinitconst samuel1_eblcr[16] = {
> +static const int samuel1_eblcr[16] = {
> 50, /* 0000 -> RESERVED */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -97,7 +97,7 @@ static const int __cpuinitconst samuel1_eblcr[16] = {
> /*
> * VIA C3 Samuel2 Stepping 1->15
> */
> -static const int __cpuinitconst samuel2_eblcr[16] = {
> +static const int samuel2_eblcr[16] = {
> 50, /* 0000 -> 5.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -119,7 +119,7 @@ static const int __cpuinitconst samuel2_eblcr[16] = {
> /*
> * VIA C3 Ezra
> */
> -static const int __cpuinitconst ezra_mults[16] = {
> +static const int ezra_mults[16] = {
> 100, /* 0000 -> 10.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -138,7 +138,7 @@ static const int __cpuinitconst ezra_mults[16] = {
> 120, /* 1111 -> 12.0x */
> };
>
> -static const int __cpuinitconst ezra_eblcr[16] = {
> +static const int ezra_eblcr[16] = {
> 50, /* 0000 -> 5.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -160,7 +160,7 @@ static const int __cpuinitconst ezra_eblcr[16] = {
> /*
> * VIA C3 (Ezra-T) [C5M].
> */
> -static const int __cpuinitconst ezrat_mults[32] = {
> +static const int ezrat_mults[32] = {
> 100, /* 0000 -> 10.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -196,7 +196,7 @@ static const int __cpuinitconst ezrat_mults[32] = {
> -1, /* 1111 -> RESERVED (12.0x) */
> };
>
> -static const int __cpuinitconst ezrat_eblcr[32] = {
> +static const int ezrat_eblcr[32] = {
> 50, /* 0000 -> 5.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -235,7 +235,7 @@ static const int __cpuinitconst ezrat_eblcr[32] = {
> /*
> * VIA C3 Nehemiah */
>
> -static const int __cpuinitconst nehemiah_mults[32] = {
> +static const int nehemiah_mults[32] = {
> 100, /* 0000 -> 10.0x */
> -1, /* 0001 -> 16.0x */
> 40, /* 0010 -> 4.0x */
> @@ -270,7 +270,7 @@ static const int __cpuinitconst nehemiah_mults[32] = {
> -1, /* 1111 -> 12.0x */
> };
>
> -static const int __cpuinitconst nehemiah_eblcr[32] = {
> +static const int nehemiah_eblcr[32] = {
> 50, /* 0000 -> 5.0x */
> 160, /* 0001 -> 16.0x */
> 40, /* 0010 -> 4.0x */
> @@ -315,7 +315,7 @@ struct mV_pos {
> unsigned short pos;
> };
>
> -static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
> +static const struct mV_pos vrm85_mV[32] = {
> {1250, 8}, {1200, 6}, {1150, 4}, {1100, 2},
> {1050, 0}, {1800, 30}, {1750, 28}, {1700, 26},
> {1650, 24}, {1600, 22}, {1550, 20}, {1500, 18},
> @@ -326,14 +326,14 @@ static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
> {1475, 17}, {1425, 15}, {1375, 13}, {1325, 11}
> };
>
> -static const unsigned char __cpuinitconst mV_vrm85[32] = {
> +static const unsigned char mV_vrm85[32] = {
> 0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11,
> 0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d,
> 0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19,
> 0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15
> };
>
> -static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
> +static const struct mV_pos mobilevrm_mV[32] = {
> {1750, 31}, {1700, 30}, {1650, 29}, {1600, 28},
> {1550, 27}, {1500, 26}, {1450, 25}, {1400, 24},
> {1350, 23}, {1300, 22}, {1250, 21}, {1200, 20},
> @@ -344,7 +344,7 @@ static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
> {675, 3}, {650, 2}, {625, 1}, {600, 0}
> };
>
> -static const unsigned char __cpuinitconst mV_mobilevrm[32] = {
> +static const unsigned char mV_mobilevrm[32] = {
> 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
> 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
> 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
> diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c
> index 8bc9f5f..7ad792d 100644
> --- a/drivers/cpufreq/longrun.c
> +++ b/drivers/cpufreq/longrun.c
> @@ -33,7 +33,7 @@ static unsigned int longrun_low_freq, longrun_high_freq;
> * Reads the current LongRun policy by access to MSR_TMTA_LONGRUN_FLAGS
> * and MSR_TMTA_LONGRUN_CTRL
> */
> -static void __cpuinit longrun_get_policy(struct cpufreq_policy *policy)
> +static void longrun_get_policy(struct cpufreq_policy *policy)
> {
> u32 msr_lo, msr_hi;
>
> @@ -163,8 +163,8 @@ static unsigned int longrun_get(unsigned int cpu)
> * TMTA rules:
> * performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
> */
> -static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
> - unsigned int *high_freq)
> +static int longrun_determine_freqs(unsigned int *low_freq,
> + unsigned int *high_freq)
> {
> u32 msr_lo, msr_hi;
> u32 save_lo, save_hi;
> @@ -256,7 +256,7 @@ static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
> }
>
>
> -static int __cpuinit longrun_cpu_init(struct cpufreq_policy *policy)
> +static int longrun_cpu_init(struct cpufreq_policy *policy)
> {
> int result = 0;
>
> diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
> index 0279d18..4b81d3e 100644
> --- a/drivers/cpufreq/omap-cpufreq.c
> +++ b/drivers/cpufreq/omap-cpufreq.c
> @@ -165,7 +165,7 @@ static inline void freq_table_free(void)
> opp_free_cpufreq_table(mpu_dev, &freq_table);
> }
>
> -static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
> +static int omap_cpu_init(struct cpufreq_policy *policy)
> {
> int result = 0;
>
> diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
> index b9f80b7..9558708 100644
> --- a/drivers/cpufreq/powernow-k7.c
> +++ b/drivers/cpufreq/powernow-k7.c
> @@ -563,7 +563,7 @@ static int powernow_verify(struct cpufreq_policy *policy)
> * We will then get the same kind of behaviour already tested under
> * the "well-known" other OS.
> */
> -static int __cpuinit fixup_sgtc(void)
> +static int fixup_sgtc(void)
> {
> unsigned int sgtc;
> unsigned int m;
> @@ -597,7 +597,7 @@ static unsigned int powernow_get(unsigned int cpu)
> }
>
>
> -static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
> +static int acer_cpufreq_pst(const struct dmi_system_id *d)
> {
> printk(KERN_WARNING PFX
> "%s laptop with broken PST tables in BIOS detected.\n",
> @@ -615,7 +615,7 @@ static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
> * A BIOS update is all that can save them.
> * Mention this, and disable cpufreq.
> */
> -static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
> +static struct dmi_system_id powernow_dmi_table[] = {
> {
> .callback = acer_cpufreq_pst,
> .ident = "Acer Aspire",
> @@ -627,7 +627,7 @@ static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
> { }
> };
>
> -static int __cpuinit powernow_cpu_init(struct cpufreq_policy *policy)
> +static int powernow_cpu_init(struct cpufreq_policy *policy)
> {
> union msr_fidvidstatus fidvidstatus;
> int result;
> diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
> index 51343a1..c71907f 100644
> --- a/drivers/cpufreq/powernow-k8.c
> +++ b/drivers/cpufreq/powernow-k8.c
> @@ -1069,7 +1069,7 @@ struct init_on_cpu {
> int rc;
> };
>
> -static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
> +static void powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
> {
> struct init_on_cpu *init_on_cpu = _init_on_cpu;
>
> @@ -1096,7 +1096,7 @@ static const char missing_pss_msg[] =
> FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
>
> /* 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;
> struct init_on_cpu init_on_cpu;
> @@ -1263,7 +1263,7 @@ static void __request_acpi_cpufreq(void)
> }
>
> /* driver entry point for init */
> -static int __cpuinit powernowk8_init(void)
> +static int powernowk8_init(void)
> {
> unsigned int i, supported_cpus = 0;
> int ret;
>
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-24 19:30 ` Paul Gortmaker
(?)
(?)
@ 2013-06-25 3:31 ` Viresh Kumar
2013-06-25 4:15 ` Joe Perches
2013-06-25 14:30 ` Paul Gortmaker
-1 siblings, 2 replies; 88+ messages in thread
From: Viresh Kumar @ 2013-06-25 3:31 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, Rafael J. Wysocki, cpufreq, linux-pm
On 25 June 2013 01:00, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index f8c2860..5687d28 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -1900,8 +1900,8 @@ no_policy:
> }
> EXPORT_SYMBOL(cpufreq_update_policy);
>
> -static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
> - unsigned long action, void *hcpu)
> +static int cpufreq_cpu_callback(struct notifier_block *nfb,
> + unsigned long action, void *hcpu)
You were not required to change second line here and also don't
change its indentation level. Check this everywhere.
> {
> unsigned int cpu = (unsigned long)hcpu;
> struct device *dev;
> diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
> index fb65dec..ff50b0c 100644
> --- a/drivers/cpufreq/cpufreq_stats.c
> +++ b/drivers/cpufreq/cpufreq_stats.c
> @@ -306,7 +306,7 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
> }
>
> static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
> - unsigned long val, void *data)
> + unsigned long val, void *data)
See.. unnecessary change.
> {
> struct cpufreq_freqs *freq = data;
> struct cpufreq_stats *stat;
> @@ -341,7 +341,7 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
> return 0;
> }
>
> -static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
> +static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
> unsigned long action,
> void *hcpu)
> {
> diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c
> index 6ec6539..8c005ac 100644
> --- a/drivers/cpufreq/dbx500-cpufreq.c
> +++ b/drivers/cpufreq/dbx500-cpufreq.c
> @@ -82,7 +82,7 @@ static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu)
> return freq_table[i].frequency;
> }
>
> -static int __cpuinit dbx500_cpufreq_init(struct cpufreq_policy *policy)
> +static int dbx500_cpufreq_init(struct cpufreq_policy *policy)
> {
> int res;
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 07f2840..b012d76 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -617,7 +617,7 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy)
> return 0;
> }
>
> -static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> +static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> {
> int cpu = policy->cpu;
>
> @@ -627,7 +627,7 @@ static int __cpuinit intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> return 0;
> }
>
> -static int __cpuinit intel_pstate_cpu_init(struct cpufreq_policy *policy)
> +static int intel_pstate_cpu_init(struct cpufreq_policy *policy)
> {
> int rc, min_pstate, max_pstate;
> struct cpudata *cpu;
> diff --git a/drivers/cpufreq/longhaul.c b/drivers/cpufreq/longhaul.c
> index b6a0a7a..8c49261 100644
> --- a/drivers/cpufreq/longhaul.c
> +++ b/drivers/cpufreq/longhaul.c
> @@ -422,7 +422,7 @@ static int guess_fsb(int mult)
> }
>
>
> -static int __cpuinit longhaul_get_ranges(void)
> +static int longhaul_get_ranges(void)
> {
> unsigned int i, j, k = 0;
> unsigned int ratio;
> @@ -526,7 +526,7 @@ static int __cpuinit longhaul_get_ranges(void)
> }
>
>
> -static void __cpuinit longhaul_setup_voltagescaling(void)
> +static void longhaul_setup_voltagescaling(void)
> {
> union msr_longhaul longhaul;
> struct mV_pos minvid, maxvid, vid;
> @@ -780,7 +780,7 @@ static int longhaul_setup_southbridge(void)
> return 0;
> }
>
> -static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)
> +static int longhaul_cpu_init(struct cpufreq_policy *policy)
> {
> struct cpuinfo_x86 *c = &cpu_data(0);
> char *cpuname = NULL;
> diff --git a/drivers/cpufreq/longhaul.h b/drivers/cpufreq/longhaul.h
> index e2dc436..1928b92 100644
> --- a/drivers/cpufreq/longhaul.h
> +++ b/drivers/cpufreq/longhaul.h
> @@ -56,7 +56,7 @@ union msr_longhaul {
> /*
> * VIA C3 Samuel 1 & Samuel 2 (stepping 0)
> */
> -static const int __cpuinitconst samuel1_mults[16] = {
> +static const int samuel1_mults[16] = {
> -1, /* 0000 -> RESERVED */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -75,7 +75,7 @@ static const int __cpuinitconst samuel1_mults[16] = {
> -1, /* 1111 -> RESERVED */
> };
>
> -static const int __cpuinitconst samuel1_eblcr[16] = {
> +static const int samuel1_eblcr[16] = {
> 50, /* 0000 -> RESERVED */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -97,7 +97,7 @@ static const int __cpuinitconst samuel1_eblcr[16] = {
> /*
> * VIA C3 Samuel2 Stepping 1->15
> */
> -static const int __cpuinitconst samuel2_eblcr[16] = {
> +static const int samuel2_eblcr[16] = {
> 50, /* 0000 -> 5.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -119,7 +119,7 @@ static const int __cpuinitconst samuel2_eblcr[16] = {
> /*
> * VIA C3 Ezra
> */
> -static const int __cpuinitconst ezra_mults[16] = {
> +static const int ezra_mults[16] = {
> 100, /* 0000 -> 10.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -138,7 +138,7 @@ static const int __cpuinitconst ezra_mults[16] = {
> 120, /* 1111 -> 12.0x */
> };
>
> -static const int __cpuinitconst ezra_eblcr[16] = {
> +static const int ezra_eblcr[16] = {
> 50, /* 0000 -> 5.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -160,7 +160,7 @@ static const int __cpuinitconst ezra_eblcr[16] = {
> /*
> * VIA C3 (Ezra-T) [C5M].
> */
> -static const int __cpuinitconst ezrat_mults[32] = {
> +static const int ezrat_mults[32] = {
> 100, /* 0000 -> 10.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -196,7 +196,7 @@ static const int __cpuinitconst ezrat_mults[32] = {
> -1, /* 1111 -> RESERVED (12.0x) */
> };
>
> -static const int __cpuinitconst ezrat_eblcr[32] = {
> +static const int ezrat_eblcr[32] = {
> 50, /* 0000 -> 5.0x */
> 30, /* 0001 -> 3.0x */
> 40, /* 0010 -> 4.0x */
> @@ -235,7 +235,7 @@ static const int __cpuinitconst ezrat_eblcr[32] = {
> /*
> * VIA C3 Nehemiah */
>
> -static const int __cpuinitconst nehemiah_mults[32] = {
> +static const int nehemiah_mults[32] = {
> 100, /* 0000 -> 10.0x */
> -1, /* 0001 -> 16.0x */
> 40, /* 0010 -> 4.0x */
> @@ -270,7 +270,7 @@ static const int __cpuinitconst nehemiah_mults[32] = {
> -1, /* 1111 -> 12.0x */
> };
>
> -static const int __cpuinitconst nehemiah_eblcr[32] = {
> +static const int nehemiah_eblcr[32] = {
> 50, /* 0000 -> 5.0x */
> 160, /* 0001 -> 16.0x */
> 40, /* 0010 -> 4.0x */
> @@ -315,7 +315,7 @@ struct mV_pos {
> unsigned short pos;
> };
>
> -static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
> +static const struct mV_pos vrm85_mV[32] = {
> {1250, 8}, {1200, 6}, {1150, 4}, {1100, 2},
> {1050, 0}, {1800, 30}, {1750, 28}, {1700, 26},
> {1650, 24}, {1600, 22}, {1550, 20}, {1500, 18},
> @@ -326,14 +326,14 @@ static const struct mV_pos __cpuinitconst vrm85_mV[32] = {
> {1475, 17}, {1425, 15}, {1375, 13}, {1325, 11}
> };
>
> -static const unsigned char __cpuinitconst mV_vrm85[32] = {
> +static const unsigned char mV_vrm85[32] = {
> 0x04, 0x14, 0x03, 0x13, 0x02, 0x12, 0x01, 0x11,
> 0x00, 0x10, 0x0f, 0x1f, 0x0e, 0x1e, 0x0d, 0x1d,
> 0x0c, 0x1c, 0x0b, 0x1b, 0x0a, 0x1a, 0x09, 0x19,
> 0x08, 0x18, 0x07, 0x17, 0x06, 0x16, 0x05, 0x15
> };
>
> -static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
> +static const struct mV_pos mobilevrm_mV[32] = {
> {1750, 31}, {1700, 30}, {1650, 29}, {1600, 28},
> {1550, 27}, {1500, 26}, {1450, 25}, {1400, 24},
> {1350, 23}, {1300, 22}, {1250, 21}, {1200, 20},
> @@ -344,7 +344,7 @@ static const struct mV_pos __cpuinitconst mobilevrm_mV[32] = {
> {675, 3}, {650, 2}, {625, 1}, {600, 0}
> };
>
> -static const unsigned char __cpuinitconst mV_mobilevrm[32] = {
> +static const unsigned char mV_mobilevrm[32] = {
> 0x1f, 0x1e, 0x1d, 0x1c, 0x1b, 0x1a, 0x19, 0x18,
> 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
> 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08,
> diff --git a/drivers/cpufreq/longrun.c b/drivers/cpufreq/longrun.c
> index 8bc9f5f..7ad792d 100644
> --- a/drivers/cpufreq/longrun.c
> +++ b/drivers/cpufreq/longrun.c
> @@ -33,7 +33,7 @@ static unsigned int longrun_low_freq, longrun_high_freq;
> * Reads the current LongRun policy by access to MSR_TMTA_LONGRUN_FLAGS
> * and MSR_TMTA_LONGRUN_CTRL
> */
> -static void __cpuinit longrun_get_policy(struct cpufreq_policy *policy)
> +static void longrun_get_policy(struct cpufreq_policy *policy)
> {
> u32 msr_lo, msr_hi;
>
> @@ -163,8 +163,8 @@ static unsigned int longrun_get(unsigned int cpu)
> * TMTA rules:
> * performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
> */
> -static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
> - unsigned int *high_freq)
> +static int longrun_determine_freqs(unsigned int *low_freq,
> + unsigned int *high_freq)
again
> {
> u32 msr_lo, msr_hi;
> u32 save_lo, save_hi;
> @@ -256,7 +256,7 @@ static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
> }
>
>
> -static int __cpuinit longrun_cpu_init(struct cpufreq_policy *policy)
> +static int longrun_cpu_init(struct cpufreq_policy *policy)
> {
> int result = 0;
>
> diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c
> index 0279d18..4b81d3e 100644
> --- a/drivers/cpufreq/omap-cpufreq.c
> +++ b/drivers/cpufreq/omap-cpufreq.c
> @@ -165,7 +165,7 @@ static inline void freq_table_free(void)
> opp_free_cpufreq_table(mpu_dev, &freq_table);
> }
>
> -static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
> +static int omap_cpu_init(struct cpufreq_policy *policy)
> {
> int result = 0;
>
> diff --git a/drivers/cpufreq/powernow-k7.c b/drivers/cpufreq/powernow-k7.c
> index b9f80b7..9558708 100644
> --- a/drivers/cpufreq/powernow-k7.c
> +++ b/drivers/cpufreq/powernow-k7.c
> @@ -563,7 +563,7 @@ static int powernow_verify(struct cpufreq_policy *policy)
> * We will then get the same kind of behaviour already tested under
> * the "well-known" other OS.
> */
> -static int __cpuinit fixup_sgtc(void)
> +static int fixup_sgtc(void)
> {
> unsigned int sgtc;
> unsigned int m;
> @@ -597,7 +597,7 @@ static unsigned int powernow_get(unsigned int cpu)
> }
>
>
> -static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
> +static int acer_cpufreq_pst(const struct dmi_system_id *d)
> {
> printk(KERN_WARNING PFX
> "%s laptop with broken PST tables in BIOS detected.\n",
> @@ -615,7 +615,7 @@ static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
> * A BIOS update is all that can save them.
> * Mention this, and disable cpufreq.
> */
> -static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
> +static struct dmi_system_id powernow_dmi_table[] = {
> {
> .callback = acer_cpufreq_pst,
> .ident = "Acer Aspire",
> @@ -627,7 +627,7 @@ static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
> { }
> };
>
> -static int __cpuinit powernow_cpu_init(struct cpufreq_policy *policy)
> +static int powernow_cpu_init(struct cpufreq_policy *policy)
> {
> union msr_fidvidstatus fidvidstatus;
> int result;
> diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
> index 51343a1..c71907f 100644
> --- a/drivers/cpufreq/powernow-k8.c
> +++ b/drivers/cpufreq/powernow-k8.c
> @@ -1069,7 +1069,7 @@ struct init_on_cpu {
> int rc;
> };
>
> -static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
> +static void powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
> {
> struct init_on_cpu *init_on_cpu = _init_on_cpu;
>
> @@ -1096,7 +1096,7 @@ static const char missing_pss_msg[] =
> FW_BUG PFX "If that doesn't help, try upgrading your BIOS.\n";
>
> /* 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;
> struct init_on_cpu init_on_cpu;
> @@ -1263,7 +1263,7 @@ static void __request_acpi_cpufreq(void)
> }
>
> /* driver entry point for init */
> -static int __cpuinit powernowk8_init(void)
> +static int powernowk8_init(void)
> {
> unsigned int i, supported_cpus = 0;
> int ret;
Fix these and add my
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Probably this can go through Rafael's pm tree. So, you can take it
out of this series if you want.
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-25 3:31 ` Viresh Kumar
@ 2013-06-25 4:15 ` Joe Perches
2013-06-25 6:44 ` Viresh Kumar
2013-06-25 14:30 ` Paul Gortmaker
1 sibling, 1 reply; 88+ messages in thread
From: Joe Perches @ 2013-06-25 4:15 UTC (permalink / raw)
To: Viresh Kumar
Cc: Paul Gortmaker, linux-kernel, Rafael J. Wysocki, cpufreq,
linux-pm
On Tue, 2013-06-25 at 09:01 +0530, Viresh Kumar wrote:
> On 25 June 2013 01:00, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
[]
> > -static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
> > - unsigned long action, void *hcpu)
> > +static int cpufreq_cpu_callback(struct notifier_block *nfb,
> > + unsigned long action, void *hcpu)
>
> You were not required to change second line here and also don't
> change its indentation level. Check this everywhere.
Paul, yes, thanks for doing that here,
but please, do it everywhere...
;)
> > diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
[]
> > @@ -306,7 +306,7 @@ static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
> > }
> >
> > static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
> > - unsigned long val, void *data)
> > + unsigned long val, void *data)
>
> See.. unnecessary change.
Or from another perspective, ideal change.
> > -static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
> > +static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
> > unsigned long action,
> > void *hcpu)
Hey Paul, you missed some too.
Viresh, there's no absolute "right" way to do this.
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-25 4:15 ` Joe Perches
@ 2013-06-25 6:44 ` Viresh Kumar
2013-06-25 6:59 ` Joe Perches
0 siblings, 1 reply; 88+ messages in thread
From: Viresh Kumar @ 2013-06-25 6:44 UTC (permalink / raw)
To: Joe Perches
Cc: Paul Gortmaker, linux-kernel, Rafael J. Wysocki, cpufreq,
linux-pm
On 25 June 2013 09:45, Joe Perches <joe@perches.com> wrote:
> Viresh, there's no absolute "right" way to do this.
Yeah Joe, but I thought its better to keep it consistent within a file.
So, while writing new files, keep what you want but for existing ones
follow what's in there.
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-25 6:44 ` Viresh Kumar
@ 2013-06-25 6:59 ` Joe Perches
2013-06-25 7:01 ` Viresh Kumar
0 siblings, 1 reply; 88+ messages in thread
From: Joe Perches @ 2013-06-25 6:59 UTC (permalink / raw)
To: Viresh Kumar
Cc: Paul Gortmaker, linux-kernel, Rafael J. Wysocki, cpufreq,
linux-pm
On Tue, 2013-06-25 at 12:14 +0530, Viresh Kumar wrote:
> On 25 June 2013 09:45, Joe Perches <joe@perches.com> wrote:
> > Viresh, there's no absolute "right" way to do this.
>
> Yeah Joe, but I thought its better to keep it consistent within a file.
> So, while writing new files, keep what you want but for existing ones
> follow what's in there.
Sure Viresh.
I could agree with that, but that's not what you
recommended though. "Check this everywhere" isn't
the same as the advice you just gave above.
There are those that think it's better to convert
each instance whenever touched to what they think
of as "kernel" style.
Me, I'd just as soon convert to aligned indentation
and generic kernel style whenever touching any code,
even if it differs from the existing file style.
cheers, Joe
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-25 6:59 ` Joe Perches
@ 2013-06-25 7:01 ` Viresh Kumar
0 siblings, 0 replies; 88+ messages in thread
From: Viresh Kumar @ 2013-06-25 7:01 UTC (permalink / raw)
To: Joe Perches
Cc: Paul Gortmaker, linux-kernel, Rafael J. Wysocki, cpufreq,
linux-pm
On 25 June 2013 12:29, Joe Perches <joe@perches.com> wrote:
> Sure Viresh.
>
> I could agree with that, but that's not what you
> recommended though. "Check this everywhere" isn't
> the same as the advice you just gave above.
So, I couldn't communicate myself well :(
What I meant is, "check all changes you are making
and be sure you are not repeating this change again".
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
2013-06-25 3:31 ` Viresh Kumar
@ 2013-06-25 14:30 ` Paul Gortmaker
2013-06-25 14:30 ` Paul Gortmaker
1 sibling, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-25 14:30 UTC (permalink / raw)
To: Viresh Kumar; +Cc: linux-kernel, Rafael J. Wysocki, cpufreq, linux-pm
On 13-06-24 11:31 PM, Viresh Kumar wrote:
> On 25 June 2013 01:00, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
>> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
>> index f8c2860..5687d28 100644
>> --- a/drivers/cpufreq/cpufreq.c
>> +++ b/drivers/cpufreq/cpufreq.c
>> @@ -1900,8 +1900,8 @@ no_policy:
>> }
>> EXPORT_SYMBOL(cpufreq_update_policy);
>>
>> -static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
>> - unsigned long action, void *hcpu)
>> +static int cpufreq_cpu_callback(struct notifier_block *nfb,
>> + unsigned long action, void *hcpu)
>
> You were not required to change second line here and also don't
> change its indentation level. Check this everywhere.
>
[...]
Since you've explicitly requested it, I've left all second lines
of args untouched in v2, now pushed to the patch queue:
http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> Fix these and add my
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>
> Probably this can go through Rafael's pm tree. So, you can take it
> out of this series if you want.
I'd encourage people to not take the patches into their specific
trees unless they really feel a specific need to do so. It will
keep the majority of them clumped together in git history that way.
Thanks,
Paul.
--
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* Re: [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files
@ 2013-06-25 14:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-25 14:30 UTC (permalink / raw)
To: Viresh Kumar; +Cc: linux-kernel, Rafael J. Wysocki, cpufreq, linux-pm
On 13-06-24 11:31 PM, Viresh Kumar wrote:
> On 25 June 2013 01:00, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
>> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
>> index f8c2860..5687d28 100644
>> --- a/drivers/cpufreq/cpufreq.c
>> +++ b/drivers/cpufreq/cpufreq.c
>> @@ -1900,8 +1900,8 @@ no_policy:
>> }
>> EXPORT_SYMBOL(cpufreq_update_policy);
>>
>> -static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
>> - unsigned long action, void *hcpu)
>> +static int cpufreq_cpu_callback(struct notifier_block *nfb,
>> + unsigned long action, void *hcpu)
>
> You were not required to change second line here and also don't
> change its indentation level. Check this everywhere.
>
[...]
Since you've explicitly requested it, I've left all second lines
of args untouched in v2, now pushed to the patch queue:
http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> Fix these and add my
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>
> Probably this can go through Rafael's pm tree. So, you can take it
> out of this series if you want.
I'd encourage people to not take the patches into their specific
trees unless they really feel a specific need to do so. It will
keep the majority of them clumped together in git history that way.
Thanks,
Paul.
--
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [lm-sensors] [PATCH 26/32] hwmon: delete __cpuinit usage from all hwmon files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Fenghua Yu, lm-sensors
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/hwmon uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: lm-sensors@lm-sensors.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/hwmon/coretemp.c | 39 ++++++++++++++++++---------------------
drivers/hwmon/via-cputemp.c | 8 ++++----
2 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index ade35cf..2e5e2dc 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -195,7 +195,7 @@ struct tjmax {
int tjmax;
};
-static const struct tjmax __cpuinitconst tjmax_table[] = {
+static const struct tjmax tjmax_table[] = {
{ "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
{ "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */
{ "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */
@@ -211,7 +211,7 @@ struct tjmax_model {
#define ANY 0xff
-static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
+static const struct tjmax_model tjmax_model_table[] = {
{ 0x1c, 10, 100000 }, /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */
{ 0x1c, ANY, 90000 }, /* Z5xx, N2xx, possibly others
* Note: Also matches 230 and 330,
@@ -226,8 +226,7 @@ static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
{ 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
};
-static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
- struct device *dev)
+static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
{
/* The 100C is default for both mobile and non mobile CPUs */
@@ -317,8 +316,7 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
return tjmax;
}
-static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
- struct device *dev)
+static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
{
int err;
u32 eax, edx;
@@ -367,8 +365,8 @@ static int create_name_attr(struct platform_data *pdata,
return device_create_file(dev, &pdata->name_attr);
}
-static int __cpuinit create_core_attrs(struct temp_data *tdata,
- struct device *dev, int attr_no)
+static int create_core_attrs(struct temp_data *tdata, struct device *dev,
+ int attr_no)
{
int err, i;
static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
@@ -401,7 +399,7 @@ exit_free:
}
-static int __cpuinit chk_ucode_version(unsigned int cpu)
+static int chk_ucode_version(unsigned int cpu)
{
struct cpuinfo_x86 *c = &cpu_data(cpu);
@@ -417,7 +415,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu)
return 0;
}
-static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
+static struct platform_device *coretemp_get_pdev(unsigned int cpu)
{
u16 phys_proc_id = TO_PHYS_ID(cpu);
struct pdev_entry *p;
@@ -434,8 +432,7 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
return NULL;
}
-static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
- int pkg_flag)
+static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
{
struct temp_data *tdata;
@@ -453,8 +450,8 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
return tdata;
}
-static int __cpuinit create_core_data(struct platform_device *pdev,
- unsigned int cpu, int pkg_flag)
+static int create_core_data(struct platform_device *pdev, unsigned int cpu,
+ int pkg_flag)
{
struct temp_data *tdata;
struct platform_data *pdata = platform_get_drvdata(pdev);
@@ -524,7 +521,7 @@ exit_free:
return err;
}
-static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag)
+static void coretemp_add_core(unsigned int cpu, int pkg_flag)
{
struct platform_device *pdev = coretemp_get_pdev(cpu);
int err;
@@ -607,7 +604,7 @@ static struct platform_driver coretemp_driver = {
.remove = coretemp_remove,
};
-static int __cpuinit coretemp_device_add(unsigned int cpu)
+static int coretemp_device_add(unsigned int cpu)
{
int err;
struct platform_device *pdev;
@@ -651,7 +648,7 @@ exit:
return err;
}
-static void __cpuinit coretemp_device_remove(unsigned int cpu)
+static void coretemp_device_remove(unsigned int cpu)
{
struct pdev_entry *p, *n;
u16 phys_proc_id = TO_PHYS_ID(cpu);
@@ -667,7 +664,7 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu)
mutex_unlock(&pdev_list_mutex);
}
-static bool __cpuinit is_any_core_online(struct platform_data *pdata)
+static bool is_any_core_online(struct platform_data *pdata)
{
int i;
@@ -681,7 +678,7 @@ static bool __cpuinit is_any_core_online(struct platform_data *pdata)
return false;
}
-static void __cpuinit get_core_online(unsigned int cpu)
+static void get_core_online(unsigned int cpu)
{
struct cpuinfo_x86 *c = &cpu_data(cpu);
struct platform_device *pdev = coretemp_get_pdev(cpu);
@@ -723,7 +720,7 @@ static void __cpuinit get_core_online(unsigned int cpu)
coretemp_add_core(cpu, 0);
}
-static void __cpuinit put_core_offline(unsigned int cpu)
+static void put_core_offline(unsigned int cpu)
{
int i, indx;
struct platform_data *pdata;
@@ -771,7 +768,7 @@ static void __cpuinit put_core_offline(unsigned int cpu)
coretemp_device_remove(cpu);
}
-static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
+static int coretemp_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long) hcpu;
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 76f157b..38944e9 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -221,7 +221,7 @@ struct pdev_entry {
static LIST_HEAD(pdev_list);
static DEFINE_MUTEX(pdev_list_mutex);
-static int __cpuinit via_cputemp_device_add(unsigned int cpu)
+static int via_cputemp_device_add(unsigned int cpu)
{
int err;
struct platform_device *pdev;
@@ -262,7 +262,7 @@ exit:
return err;
}
-static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
+static void via_cputemp_device_remove(unsigned int cpu)
{
struct pdev_entry *p;
@@ -279,8 +279,8 @@ static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
mutex_unlock(&pdev_list_mutex);
}
-static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int via_cputemp_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long) hcpu;
--
1.8.1.2
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 26/32] hwmon: delete __cpuinit usage from all hwmon files
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Fenghua Yu, lm-sensors
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/hwmon uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: lm-sensors@lm-sensors.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/hwmon/coretemp.c | 39 ++++++++++++++++++---------------------
drivers/hwmon/via-cputemp.c | 8 ++++----
2 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index ade35cf..2e5e2dc 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -195,7 +195,7 @@ struct tjmax {
int tjmax;
};
-static const struct tjmax __cpuinitconst tjmax_table[] = {
+static const struct tjmax tjmax_table[] = {
{ "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
{ "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */
{ "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */
@@ -211,7 +211,7 @@ struct tjmax_model {
#define ANY 0xff
-static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
+static const struct tjmax_model tjmax_model_table[] = {
{ 0x1c, 10, 100000 }, /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */
{ 0x1c, ANY, 90000 }, /* Z5xx, N2xx, possibly others
* Note: Also matches 230 and 330,
@@ -226,8 +226,7 @@ static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
{ 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
};
-static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
- struct device *dev)
+static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
{
/* The 100C is default for both mobile and non mobile CPUs */
@@ -317,8 +316,7 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
return tjmax;
}
-static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
- struct device *dev)
+static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
{
int err;
u32 eax, edx;
@@ -367,8 +365,8 @@ static int create_name_attr(struct platform_data *pdata,
return device_create_file(dev, &pdata->name_attr);
}
-static int __cpuinit create_core_attrs(struct temp_data *tdata,
- struct device *dev, int attr_no)
+static int create_core_attrs(struct temp_data *tdata, struct device *dev,
+ int attr_no)
{
int err, i;
static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
@@ -401,7 +399,7 @@ exit_free:
}
-static int __cpuinit chk_ucode_version(unsigned int cpu)
+static int chk_ucode_version(unsigned int cpu)
{
struct cpuinfo_x86 *c = &cpu_data(cpu);
@@ -417,7 +415,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu)
return 0;
}
-static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
+static struct platform_device *coretemp_get_pdev(unsigned int cpu)
{
u16 phys_proc_id = TO_PHYS_ID(cpu);
struct pdev_entry *p;
@@ -434,8 +432,7 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
return NULL;
}
-static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
- int pkg_flag)
+static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
{
struct temp_data *tdata;
@@ -453,8 +450,8 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
return tdata;
}
-static int __cpuinit create_core_data(struct platform_device *pdev,
- unsigned int cpu, int pkg_flag)
+static int create_core_data(struct platform_device *pdev, unsigned int cpu,
+ int pkg_flag)
{
struct temp_data *tdata;
struct platform_data *pdata = platform_get_drvdata(pdev);
@@ -524,7 +521,7 @@ exit_free:
return err;
}
-static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag)
+static void coretemp_add_core(unsigned int cpu, int pkg_flag)
{
struct platform_device *pdev = coretemp_get_pdev(cpu);
int err;
@@ -607,7 +604,7 @@ static struct platform_driver coretemp_driver = {
.remove = coretemp_remove,
};
-static int __cpuinit coretemp_device_add(unsigned int cpu)
+static int coretemp_device_add(unsigned int cpu)
{
int err;
struct platform_device *pdev;
@@ -651,7 +648,7 @@ exit:
return err;
}
-static void __cpuinit coretemp_device_remove(unsigned int cpu)
+static void coretemp_device_remove(unsigned int cpu)
{
struct pdev_entry *p, *n;
u16 phys_proc_id = TO_PHYS_ID(cpu);
@@ -667,7 +664,7 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu)
mutex_unlock(&pdev_list_mutex);
}
-static bool __cpuinit is_any_core_online(struct platform_data *pdata)
+static bool is_any_core_online(struct platform_data *pdata)
{
int i;
@@ -681,7 +678,7 @@ static bool __cpuinit is_any_core_online(struct platform_data *pdata)
return false;
}
-static void __cpuinit get_core_online(unsigned int cpu)
+static void get_core_online(unsigned int cpu)
{
struct cpuinfo_x86 *c = &cpu_data(cpu);
struct platform_device *pdev = coretemp_get_pdev(cpu);
@@ -723,7 +720,7 @@ static void __cpuinit get_core_online(unsigned int cpu)
coretemp_add_core(cpu, 0);
}
-static void __cpuinit put_core_offline(unsigned int cpu)
+static void put_core_offline(unsigned int cpu)
{
int i, indx;
struct platform_data *pdata;
@@ -771,7 +768,7 @@ static void __cpuinit put_core_offline(unsigned int cpu)
coretemp_device_remove(cpu);
}
-static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
+static int coretemp_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long) hcpu;
diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
index 76f157b..38944e9 100644
--- a/drivers/hwmon/via-cputemp.c
+++ b/drivers/hwmon/via-cputemp.c
@@ -221,7 +221,7 @@ struct pdev_entry {
static LIST_HEAD(pdev_list);
static DEFINE_MUTEX(pdev_list_mutex);
-static int __cpuinit via_cputemp_device_add(unsigned int cpu)
+static int via_cputemp_device_add(unsigned int cpu)
{
int err;
struct platform_device *pdev;
@@ -262,7 +262,7 @@ exit:
return err;
}
-static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
+static void via_cputemp_device_remove(unsigned int cpu)
{
struct pdev_entry *p;
@@ -279,8 +279,8 @@ static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
mutex_unlock(&pdev_list_mutex);
}
-static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int via_cputemp_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long) hcpu;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [lm-sensors] [PATCH 26/32] hwmon: delete __cpuinit usage from all hwmon files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 20:11 ` Guenter Roeck
-1 siblings, 0 replies; 88+ messages in thread
From: Guenter Roeck @ 2013-06-24 20:11 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, lm-sensors, Fenghua Yu
On Mon, Jun 24, 2013 at 03:30:31PM -0400, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> This removes all the drivers/hwmon uses of the __cpuinit macros
> from all C files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: lm-sensors@lm-sensors.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
> drivers/hwmon/coretemp.c | 39 ++++++++++++++++++---------------------
> drivers/hwmon/via-cputemp.c | 8 ++++----
> 2 files changed, 22 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
> index ade35cf..2e5e2dc 100644
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@ -195,7 +195,7 @@ struct tjmax {
> int tjmax;
> };
>
> -static const struct tjmax __cpuinitconst tjmax_table[] = {
> +static const struct tjmax tjmax_table[] = {
> { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
> { "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */
> { "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */
> @@ -211,7 +211,7 @@ struct tjmax_model {
>
> #define ANY 0xff
>
> -static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
> +static const struct tjmax_model tjmax_model_table[] = {
> { 0x1c, 10, 100000 }, /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */
> { 0x1c, ANY, 90000 }, /* Z5xx, N2xx, possibly others
> * Note: Also matches 230 and 330,
> @@ -226,8 +226,7 @@ static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
> { 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
> };
>
> -static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
> - struct device *dev)
> +static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
> {
> /* The 100C is default for both mobile and non mobile CPUs */
>
> @@ -317,8 +316,7 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
> return tjmax;
> }
>
> -static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
> - struct device *dev)
> +static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
> {
> int err;
> u32 eax, edx;
> @@ -367,8 +365,8 @@ static int create_name_attr(struct platform_data *pdata,
> return device_create_file(dev, &pdata->name_attr);
> }
>
> -static int __cpuinit create_core_attrs(struct temp_data *tdata,
> - struct device *dev, int attr_no)
> +static int create_core_attrs(struct temp_data *tdata, struct device *dev,
> + int attr_no)
> {
> int err, i;
> static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
> @@ -401,7 +399,7 @@ exit_free:
> }
>
>
> -static int __cpuinit chk_ucode_version(unsigned int cpu)
> +static int chk_ucode_version(unsigned int cpu)
> {
> struct cpuinfo_x86 *c = &cpu_data(cpu);
>
> @@ -417,7 +415,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu)
> return 0;
> }
>
> -static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
> +static struct platform_device *coretemp_get_pdev(unsigned int cpu)
> {
> u16 phys_proc_id = TO_PHYS_ID(cpu);
> struct pdev_entry *p;
> @@ -434,8 +432,7 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
> return NULL;
> }
>
> -static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
> - int pkg_flag)
> +static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
> {
> struct temp_data *tdata;
>
> @@ -453,8 +450,8 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
> return tdata;
> }
>
> -static int __cpuinit create_core_data(struct platform_device *pdev,
> - unsigned int cpu, int pkg_flag)
> +static int create_core_data(struct platform_device *pdev, unsigned int cpu,
> + int pkg_flag)
> {
> struct temp_data *tdata;
> struct platform_data *pdata = platform_get_drvdata(pdev);
> @@ -524,7 +521,7 @@ exit_free:
> return err;
> }
>
> -static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag)
> +static void coretemp_add_core(unsigned int cpu, int pkg_flag)
> {
> struct platform_device *pdev = coretemp_get_pdev(cpu);
> int err;
> @@ -607,7 +604,7 @@ static struct platform_driver coretemp_driver = {
> .remove = coretemp_remove,
> };
>
> -static int __cpuinit coretemp_device_add(unsigned int cpu)
> +static int coretemp_device_add(unsigned int cpu)
> {
> int err;
> struct platform_device *pdev;
> @@ -651,7 +648,7 @@ exit:
> return err;
> }
>
> -static void __cpuinit coretemp_device_remove(unsigned int cpu)
> +static void coretemp_device_remove(unsigned int cpu)
> {
> struct pdev_entry *p, *n;
> u16 phys_proc_id = TO_PHYS_ID(cpu);
> @@ -667,7 +664,7 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu)
> mutex_unlock(&pdev_list_mutex);
> }
>
> -static bool __cpuinit is_any_core_online(struct platform_data *pdata)
> +static bool is_any_core_online(struct platform_data *pdata)
> {
> int i;
>
> @@ -681,7 +678,7 @@ static bool __cpuinit is_any_core_online(struct platform_data *pdata)
> return false;
> }
>
> -static void __cpuinit get_core_online(unsigned int cpu)
> +static void get_core_online(unsigned int cpu)
> {
> struct cpuinfo_x86 *c = &cpu_data(cpu);
> struct platform_device *pdev = coretemp_get_pdev(cpu);
> @@ -723,7 +720,7 @@ static void __cpuinit get_core_online(unsigned int cpu)
> coretemp_add_core(cpu, 0);
> }
>
> -static void __cpuinit put_core_offline(unsigned int cpu)
> +static void put_core_offline(unsigned int cpu)
> {
> int i, indx;
> struct platform_data *pdata;
> @@ -771,7 +768,7 @@ static void __cpuinit put_core_offline(unsigned int cpu)
> coretemp_device_remove(cpu);
> }
>
> -static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
> +static int coretemp_cpu_callback(struct notifier_block *nfb,
> unsigned long action, void *hcpu)
> {
> unsigned int cpu = (unsigned long) hcpu;
> diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
> index 76f157b..38944e9 100644
> --- a/drivers/hwmon/via-cputemp.c
> +++ b/drivers/hwmon/via-cputemp.c
> @@ -221,7 +221,7 @@ struct pdev_entry {
> static LIST_HEAD(pdev_list);
> static DEFINE_MUTEX(pdev_list_mutex);
>
> -static int __cpuinit via_cputemp_device_add(unsigned int cpu)
> +static int via_cputemp_device_add(unsigned int cpu)
> {
> int err;
> struct platform_device *pdev;
> @@ -262,7 +262,7 @@ exit:
> return err;
> }
>
> -static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
> +static void via_cputemp_device_remove(unsigned int cpu)
> {
> struct pdev_entry *p;
>
> @@ -279,8 +279,8 @@ static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
> mutex_unlock(&pdev_list_mutex);
> }
>
> -static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
> - unsigned long action, void *hcpu)
> +static int via_cputemp_cpu_callback(struct notifier_block *nfb,
> + unsigned long action, void *hcpu)
> {
> unsigned int cpu = (unsigned long) hcpu;
>
> --
> 1.8.1.2
>
>
> _______________________________________________
> lm-sensors mailing list
> lm-sensors@lm-sensors.org
> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
>
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [lm-sensors] [PATCH 26/32] hwmon: delete __cpuinit usage from all hwmon files
@ 2013-06-24 20:11 ` Guenter Roeck
0 siblings, 0 replies; 88+ messages in thread
From: Guenter Roeck @ 2013-06-24 20:11 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, lm-sensors, Fenghua Yu
On Mon, Jun 24, 2013 at 03:30:31PM -0400, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> This removes all the drivers/hwmon uses of the __cpuinit macros
> from all C files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: lm-sensors@lm-sensors.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
>
> [This commit is part of the __cpuinit removal work. If you don't see
> any problems with it, then you don't have to do anything ; it will be
> submitted with all the rest of the __cpuinit removal work. On the
> other hand, if you want to carry this patch in with your other pending
> changes so as to handle conflicts with other pending work yourself, then
> that is fine too, as the commits can largely be treated independently.
> For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
>
> drivers/hwmon/coretemp.c | 39 ++++++++++++++++++---------------------
> drivers/hwmon/via-cputemp.c | 8 ++++----
> 2 files changed, 22 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
> index ade35cf..2e5e2dc 100644
> --- a/drivers/hwmon/coretemp.c
> +++ b/drivers/hwmon/coretemp.c
> @@ -195,7 +195,7 @@ struct tjmax {
> int tjmax;
> };
>
> -static const struct tjmax __cpuinitconst tjmax_table[] = {
> +static const struct tjmax tjmax_table[] = {
> { "CPU 230", 100000 }, /* Model 0x1c, stepping 2 */
> { "CPU 330", 125000 }, /* Model 0x1c, stepping 2 */
> { "CPU CE4110", 110000 }, /* Model 0x1c, stepping 10 Sodaville */
> @@ -211,7 +211,7 @@ struct tjmax_model {
>
> #define ANY 0xff
>
> -static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
> +static const struct tjmax_model tjmax_model_table[] = {
> { 0x1c, 10, 100000 }, /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */
> { 0x1c, ANY, 90000 }, /* Z5xx, N2xx, possibly others
> * Note: Also matches 230 and 330,
> @@ -226,8 +226,7 @@ static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
> { 0x36, ANY, 100000 }, /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
> };
>
> -static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
> - struct device *dev)
> +static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
> {
> /* The 100C is default for both mobile and non mobile CPUs */
>
> @@ -317,8 +316,7 @@ static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
> return tjmax;
> }
>
> -static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
> - struct device *dev)
> +static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
> {
> int err;
> u32 eax, edx;
> @@ -367,8 +365,8 @@ static int create_name_attr(struct platform_data *pdata,
> return device_create_file(dev, &pdata->name_attr);
> }
>
> -static int __cpuinit create_core_attrs(struct temp_data *tdata,
> - struct device *dev, int attr_no)
> +static int create_core_attrs(struct temp_data *tdata, struct device *dev,
> + int attr_no)
> {
> int err, i;
> static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
> @@ -401,7 +399,7 @@ exit_free:
> }
>
>
> -static int __cpuinit chk_ucode_version(unsigned int cpu)
> +static int chk_ucode_version(unsigned int cpu)
> {
> struct cpuinfo_x86 *c = &cpu_data(cpu);
>
> @@ -417,7 +415,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu)
> return 0;
> }
>
> -static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
> +static struct platform_device *coretemp_get_pdev(unsigned int cpu)
> {
> u16 phys_proc_id = TO_PHYS_ID(cpu);
> struct pdev_entry *p;
> @@ -434,8 +432,7 @@ static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
> return NULL;
> }
>
> -static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
> - int pkg_flag)
> +static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
> {
> struct temp_data *tdata;
>
> @@ -453,8 +450,8 @@ static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
> return tdata;
> }
>
> -static int __cpuinit create_core_data(struct platform_device *pdev,
> - unsigned int cpu, int pkg_flag)
> +static int create_core_data(struct platform_device *pdev, unsigned int cpu,
> + int pkg_flag)
> {
> struct temp_data *tdata;
> struct platform_data *pdata = platform_get_drvdata(pdev);
> @@ -524,7 +521,7 @@ exit_free:
> return err;
> }
>
> -static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag)
> +static void coretemp_add_core(unsigned int cpu, int pkg_flag)
> {
> struct platform_device *pdev = coretemp_get_pdev(cpu);
> int err;
> @@ -607,7 +604,7 @@ static struct platform_driver coretemp_driver = {
> .remove = coretemp_remove,
> };
>
> -static int __cpuinit coretemp_device_add(unsigned int cpu)
> +static int coretemp_device_add(unsigned int cpu)
> {
> int err;
> struct platform_device *pdev;
> @@ -651,7 +648,7 @@ exit:
> return err;
> }
>
> -static void __cpuinit coretemp_device_remove(unsigned int cpu)
> +static void coretemp_device_remove(unsigned int cpu)
> {
> struct pdev_entry *p, *n;
> u16 phys_proc_id = TO_PHYS_ID(cpu);
> @@ -667,7 +664,7 @@ static void __cpuinit coretemp_device_remove(unsigned int cpu)
> mutex_unlock(&pdev_list_mutex);
> }
>
> -static bool __cpuinit is_any_core_online(struct platform_data *pdata)
> +static bool is_any_core_online(struct platform_data *pdata)
> {
> int i;
>
> @@ -681,7 +678,7 @@ static bool __cpuinit is_any_core_online(struct platform_data *pdata)
> return false;
> }
>
> -static void __cpuinit get_core_online(unsigned int cpu)
> +static void get_core_online(unsigned int cpu)
> {
> struct cpuinfo_x86 *c = &cpu_data(cpu);
> struct platform_device *pdev = coretemp_get_pdev(cpu);
> @@ -723,7 +720,7 @@ static void __cpuinit get_core_online(unsigned int cpu)
> coretemp_add_core(cpu, 0);
> }
>
> -static void __cpuinit put_core_offline(unsigned int cpu)
> +static void put_core_offline(unsigned int cpu)
> {
> int i, indx;
> struct platform_data *pdata;
> @@ -771,7 +768,7 @@ static void __cpuinit put_core_offline(unsigned int cpu)
> coretemp_device_remove(cpu);
> }
>
> -static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
> +static int coretemp_cpu_callback(struct notifier_block *nfb,
> unsigned long action, void *hcpu)
> {
> unsigned int cpu = (unsigned long) hcpu;
> diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
> index 76f157b..38944e9 100644
> --- a/drivers/hwmon/via-cputemp.c
> +++ b/drivers/hwmon/via-cputemp.c
> @@ -221,7 +221,7 @@ struct pdev_entry {
> static LIST_HEAD(pdev_list);
> static DEFINE_MUTEX(pdev_list_mutex);
>
> -static int __cpuinit via_cputemp_device_add(unsigned int cpu)
> +static int via_cputemp_device_add(unsigned int cpu)
> {
> int err;
> struct platform_device *pdev;
> @@ -262,7 +262,7 @@ exit:
> return err;
> }
>
> -static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
> +static void via_cputemp_device_remove(unsigned int cpu)
> {
> struct pdev_entry *p;
>
> @@ -279,8 +279,8 @@ static void __cpuinit via_cputemp_device_remove(unsigned int cpu)
> mutex_unlock(&pdev_list_mutex);
> }
>
> -static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
> - unsigned long action, void *hcpu)
> +static int via_cputemp_cpu_callback(struct notifier_block *nfb,
> + unsigned long action, void *hcpu)
> {
> unsigned int cpu = (unsigned long) hcpu;
>
> --
> 1.8.1.2
>
>
> _______________________________________________
> lm-sensors mailing list
> lm-sensors@lm-sensors.org
> http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 27/32] acpi: delete __cpuinit usage from all acpi files
2013-06-24 19:30 ` Paul Gortmaker
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Len Brown, Rafael J. Wysocki, linux-acpi
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/acpi uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Len Brown <lenb@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-acpi@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/acpi/acpi_processor.c | 2 +-
drivers/acpi/processor_core.c | 8 ++++----
drivers/acpi/processor_driver.c | 8 ++++----
drivers/acpi/processor_idle.c | 6 ++----
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index e9b01e3..fd6c51c 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -340,7 +340,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
*/
static DEFINE_PER_CPU(void *, processor_device_array);
-static int __cpuinit acpi_processor_add(struct acpi_device *device,
+static int acpi_processor_add(struct acpi_device *device,
const struct acpi_device_id *id)
{
struct acpi_processor *pr;
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 164d495..a5e9f4a 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -253,7 +253,7 @@ static bool __init processor_physically_present(acpi_handle handle)
return true;
}
-static void __cpuinit acpi_set_pdc_bits(u32 *buf)
+static void acpi_set_pdc_bits(u32 *buf)
{
buf[0] = ACPI_PDC_REVISION_ID;
buf[1] = 1;
@@ -265,7 +265,7 @@ static void __cpuinit acpi_set_pdc_bits(u32 *buf)
arch_acpi_set_pdc_bits(buf);
}
-static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
+static struct acpi_object_list *acpi_processor_alloc_pdc(void)
{
struct acpi_object_list *obj_list;
union acpi_object *obj;
@@ -308,7 +308,7 @@ static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
* _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features.
*/
-static int __cpuinit
+static int
acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
{
acpi_status status = AE_OK;
@@ -336,7 +336,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
return status;
}
-void __cpuinit acpi_processor_set_pdc(acpi_handle handle)
+void acpi_processor_set_pdc(acpi_handle handle)
{
struct acpi_object_list *obj_list;
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index d93963f..e1acb47 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -124,9 +124,9 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
return;
}
-static __cpuinit int __acpi_processor_start(struct acpi_device *device);
+static int __acpi_processor_start(struct acpi_device *device);
-static int __cpuinit acpi_cpu_soft_notify(struct notifier_block *nfb,
+static int acpi_cpu_soft_notify(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@@ -168,7 +168,7 @@ static struct notifier_block __refdata acpi_cpu_notifier =
.notifier_call = acpi_cpu_soft_notify,
};
-static __cpuinit int __acpi_processor_start(struct acpi_device *device)
+static int __acpi_processor_start(struct acpi_device *device)
{
struct acpi_processor *pr = acpi_driver_data(device);
acpi_status status;
@@ -232,7 +232,7 @@ static __cpuinit int __acpi_processor_start(struct acpi_device *device)
return result;
}
-static int __cpuinit acpi_processor_start(struct device *dev)
+static int acpi_processor_start(struct device *dev)
{
struct acpi_device *device;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 0461ccc..f98dd00 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -96,9 +96,7 @@ static int set_max_cstate(const struct dmi_system_id *id)
return 0;
}
-/* Actually this shouldn't be __cpuinitdata, would be better to fix the
- callers to only run once -AK */
-static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
+static struct dmi_system_id processor_power_dmi_table[] = {
{ set_max_cstate, "Clevo 5600D", {
DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
@@ -1165,7 +1163,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
static int acpi_processor_registered;
-int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
+int acpi_processor_power_init(struct acpi_processor *pr)
{
acpi_status status = 0;
int retval;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 27/32] acpi: delete __cpuinit usage from all acpi files
@ 2013-06-24 19:30 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Len Brown, Rafael J. Wysocki, linux-acpi
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/acpi uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Len Brown <lenb@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-acpi@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/acpi/acpi_processor.c | 2 +-
drivers/acpi/processor_core.c | 8 ++++----
drivers/acpi/processor_driver.c | 8 ++++----
drivers/acpi/processor_idle.c | 6 ++----
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
index e9b01e3..fd6c51c 100644
--- a/drivers/acpi/acpi_processor.c
+++ b/drivers/acpi/acpi_processor.c
@@ -340,7 +340,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
*/
static DEFINE_PER_CPU(void *, processor_device_array);
-static int __cpuinit acpi_processor_add(struct acpi_device *device,
+static int acpi_processor_add(struct acpi_device *device,
const struct acpi_device_id *id)
{
struct acpi_processor *pr;
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 164d495..a5e9f4a 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -253,7 +253,7 @@ static bool __init processor_physically_present(acpi_handle handle)
return true;
}
-static void __cpuinit acpi_set_pdc_bits(u32 *buf)
+static void acpi_set_pdc_bits(u32 *buf)
{
buf[0] = ACPI_PDC_REVISION_ID;
buf[1] = 1;
@@ -265,7 +265,7 @@ static void __cpuinit acpi_set_pdc_bits(u32 *buf)
arch_acpi_set_pdc_bits(buf);
}
-static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
+static struct acpi_object_list *acpi_processor_alloc_pdc(void)
{
struct acpi_object_list *obj_list;
union acpi_object *obj;
@@ -308,7 +308,7 @@ static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
* _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features.
*/
-static int __cpuinit
+static int
acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
{
acpi_status status = AE_OK;
@@ -336,7 +336,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
return status;
}
-void __cpuinit acpi_processor_set_pdc(acpi_handle handle)
+void acpi_processor_set_pdc(acpi_handle handle)
{
struct acpi_object_list *obj_list;
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index d93963f..e1acb47 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -124,9 +124,9 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
return;
}
-static __cpuinit int __acpi_processor_start(struct acpi_device *device);
+static int __acpi_processor_start(struct acpi_device *device);
-static int __cpuinit acpi_cpu_soft_notify(struct notifier_block *nfb,
+static int acpi_cpu_soft_notify(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@@ -168,7 +168,7 @@ static struct notifier_block __refdata acpi_cpu_notifier =
.notifier_call = acpi_cpu_soft_notify,
};
-static __cpuinit int __acpi_processor_start(struct acpi_device *device)
+static int __acpi_processor_start(struct acpi_device *device)
{
struct acpi_processor *pr = acpi_driver_data(device);
acpi_status status;
@@ -232,7 +232,7 @@ static __cpuinit int __acpi_processor_start(struct acpi_device *device)
return result;
}
-static int __cpuinit acpi_processor_start(struct device *dev)
+static int acpi_processor_start(struct device *dev)
{
struct acpi_device *device;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 0461ccc..f98dd00 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -96,9 +96,7 @@ static int set_max_cstate(const struct dmi_system_id *id)
return 0;
}
-/* Actually this shouldn't be __cpuinitdata, would be better to fix the
- callers to only run once -AK */
-static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
+static struct dmi_system_id processor_power_dmi_table[] = {
{ set_max_cstate, "Clevo 5600D", {
DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")},
@@ -1165,7 +1163,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr)
static int acpi_processor_registered;
-int __cpuinit acpi_processor_power_init(struct acpi_processor *pr)
+int acpi_processor_power_init(struct acpi_processor *pr)
{
acpi_status status = 0;
int retval;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread
* [PATCH 28/32] net: delete __cpuinit usage from all net files
2013-06-24 19:30 ` Paul Gortmaker
` (30 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, David S. Miller, netdev
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the net/* uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
net/core/flow.c | 4 ++--
net/iucv/iucv.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/flow.c b/net/core/flow.c
index 7102f16..dfa602c 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -403,7 +403,7 @@ void flow_cache_flush_deferred(void)
schedule_work(&flow_cache_flush_work);
}
-static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu)
+static int flow_cache_cpu_prepare(struct flow_cache *fc, int cpu)
{
struct flow_cache_percpu *fcp = per_cpu_ptr(fc->percpu, cpu);
size_t sz = sizeof(struct hlist_head) * flow_cache_hash_size(fc);
@@ -421,7 +421,7 @@ static int __cpuinit flow_cache_cpu_prepare(struct flow_cache *fc, int cpu)
return 0;
}
-static int __cpuinit flow_cache_cpu(struct notifier_block *nfb,
+static int flow_cache_cpu(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 4fe76ff..cd5b8ec 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -621,7 +621,7 @@ static void iucv_disable(void)
put_online_cpus();
}
-static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
+static int iucv_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
cpumask_t cpumask;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 29/32] rcu: delete __cpuinit usage from all rcu files
2013-06-24 19:30 ` Paul Gortmaker
` (31 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-25 1:10 ` Josh Triplett
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel
Cc: Paul Gortmaker, Paul E. McKenney, Josh Triplett, Dipankar Sarma
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/rcu uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Josh Triplett <josh@freedesktop.org>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
kernel/rcutorture.c | 6 +++---
kernel/rcutree.c | 6 +++---
kernel/rcutree.h | 4 ++--
kernel/rcutree_plugin.h | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index b1fa551..f4871e5 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -1476,7 +1476,7 @@ rcu_torture_shutdown(void *arg)
* Execute random CPU-hotplug operations at the interval specified
* by the onoff_interval.
*/
-static int __cpuinit
+static int
rcu_torture_onoff(void *arg)
{
int cpu;
@@ -1558,7 +1558,7 @@ rcu_torture_onoff(void *arg)
return 0;
}
-static int __cpuinit
+static int
rcu_torture_onoff_init(void)
{
int ret;
@@ -1601,7 +1601,7 @@ static void rcu_torture_onoff_cleanup(void)
* CPU-stall kthread. It waits as specified by stall_cpu_holdoff, then
* induces a CPU stall for the time specified by stall_cpu.
*/
-static int __cpuinit rcu_torture_stall(void *args)
+static int rcu_torture_stall(void *args)
{
unsigned long stop_at;
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
index e08abb9..068de3a 100644
--- a/kernel/rcutree.c
+++ b/kernel/rcutree.c
@@ -2910,7 +2910,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
* can accept some slop in the rsp->completed access due to the fact
* that this CPU cannot possibly have any RCU callbacks in flight yet.
*/
-static void __cpuinit
+static void
rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
{
unsigned long flags;
@@ -2962,7 +2962,7 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
mutex_unlock(&rsp->onoff_mutex);
}
-static void __cpuinit rcu_prepare_cpu(int cpu)
+static void rcu_prepare_cpu(int cpu)
{
struct rcu_state *rsp;
@@ -2974,7 +2974,7 @@ static void __cpuinit rcu_prepare_cpu(int cpu)
/*
* Handle CPU online/offline notification events.
*/
-static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
+static int rcu_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
index 4a39d36..b383258 100644
--- a/kernel/rcutree.h
+++ b/kernel/rcutree.h
@@ -521,10 +521,10 @@ static void invoke_rcu_callbacks_kthread(void);
static bool rcu_is_callbacks_kthread(void);
#ifdef CONFIG_RCU_BOOST
static void rcu_preempt_do_callbacks(void);
-static int __cpuinit rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
+static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
struct rcu_node *rnp);
#endif /* #ifdef CONFIG_RCU_BOOST */
-static void __cpuinit rcu_prepare_kthreads(int cpu);
+static void rcu_prepare_kthreads(int cpu);
static void rcu_cleanup_after_idle(int cpu);
static void rcu_prepare_for_idle(int cpu);
static void rcu_idle_count_callbacks_posted(void);
diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
index 63098a5..769e12e 100644
--- a/kernel/rcutree_plugin.h
+++ b/kernel/rcutree_plugin.h
@@ -1352,7 +1352,7 @@ static void rcu_preempt_boost_start_gp(struct rcu_node *rnp)
* already exist. We only create this kthread for preemptible RCU.
* Returns zero if all is well, a negated errno otherwise.
*/
-static int __cpuinit rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
+static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
struct rcu_node *rnp)
{
int rnp_index = rnp - &rsp->node[0];
@@ -1507,7 +1507,7 @@ static int __init rcu_spawn_kthreads(void)
}
early_initcall(rcu_spawn_kthreads);
-static void __cpuinit rcu_prepare_kthreads(int cpu)
+static void rcu_prepare_kthreads(int cpu)
{
struct rcu_data *rdp = per_cpu_ptr(rcu_state->rda, cpu);
struct rcu_node *rnp = rdp->mynode;
@@ -1549,7 +1549,7 @@ static int __init rcu_scheduler_really_started(void)
}
early_initcall(rcu_scheduler_really_started);
-static void __cpuinit rcu_prepare_kthreads(int cpu)
+static void rcu_prepare_kthreads(int cpu)
{
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 29/32] rcu: delete __cpuinit usage from all rcu files
2013-06-24 19:30 ` [PATCH 29/32] rcu: delete __cpuinit usage from all rcu files Paul Gortmaker
@ 2013-06-25 1:10 ` Josh Triplett
2013-06-25 19:32 ` Paul E. McKenney
0 siblings, 1 reply; 88+ messages in thread
From: Josh Triplett @ 2013-06-25 1:10 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel, Paul E. McKenney, Dipankar Sarma
On Mon, Jun 24, 2013 at 03:30:34PM -0400, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> This removes all the drivers/rcu uses of the __cpuinit macros
> from all C files.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
^ permalink raw reply [flat|nested] 88+ messages in thread* Re: [PATCH 29/32] rcu: delete __cpuinit usage from all rcu files
2013-06-25 1:10 ` Josh Triplett
@ 2013-06-25 19:32 ` Paul E. McKenney
0 siblings, 0 replies; 88+ messages in thread
From: Paul E. McKenney @ 2013-06-25 19:32 UTC (permalink / raw)
To: Josh Triplett; +Cc: Paul Gortmaker, linux-kernel, Dipankar Sarma
On Mon, Jun 24, 2013 at 06:10:46PM -0700, Josh Triplett wrote:
> On Mon, Jun 24, 2013 at 03:30:34PM -0400, Paul Gortmaker wrote:
> > The __cpuinit type of throwaway sections might have made sense
> > some time ago when RAM was more constrained, but now the savings
> > do not offset the cost and complications. For example, the fix in
> > commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> > is a good example of the nasty type of bugs that can be created
> > with improper use of the various __init prefixes.
> >
> > After a discussion on LKML[1] it was decided that cpuinit should go
> > the way of devinit and be phased out. Once all the users are gone,
> > we can then finally remove the macros themselves from linux/init.h.
> >
> > This removes all the drivers/rcu uses of the __cpuinit macros
> > from all C files.
> >
> > [1] https://lkml.org/lkml/2013/5/20/589
> >
> > Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> > Cc: Josh Triplett <josh@freedesktop.org>
> > Cc: Dipankar Sarma <dipankar@in.ibm.com>
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> > ---
>
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Queued for 3.12 with Josh's Reviewed-by. Thank you both!
Thanx, Paul
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 30/32] kernel: delete __cpuinit usage from all core kernel files
2013-06-24 19:30 ` Paul Gortmaker
` (32 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the uses of the __cpuinit macros from C files in
the core kernel directories (kernel, init, lib, mm, and include)
that don't really have a specific maintainer.
[1] https://lkml.org/lkml/2013/5/20/589
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
Documentation/cpu-hotplug.txt | 6 +++---
include/linux/cpu.h | 2 +-
include/linux/perf_event.h | 2 +-
init/calibrate.c | 13 ++++++++-----
kernel/cpu.c | 6 +++---
kernel/events/core.c | 4 ++--
kernel/fork.c | 2 +-
kernel/hrtimer.c | 6 +++---
kernel/printk.c | 2 +-
kernel/profile.c | 2 +-
kernel/relay.c | 2 +-
kernel/sched/core.c | 12 ++++++------
kernel/sched/fair.c | 2 +-
kernel/smp.c | 2 +-
kernel/smpboot.c | 2 +-
kernel/softirq.c | 8 ++++----
kernel/time/tick-sched.c | 2 +-
kernel/timer.c | 10 +++++-----
kernel/workqueue.c | 4 ++--
lib/Kconfig.debug | 2 +-
lib/earlycpio.c | 2 +-
lib/percpu_counter.c | 2 +-
mm/memcontrol.c | 2 +-
mm/page-writeback.c | 4 ++--
mm/slab.c | 10 +++++-----
mm/slub.c | 4 ++--
mm/vmstat.c | 6 +++---
27 files changed, 62 insertions(+), 59 deletions(-)
diff --git a/Documentation/cpu-hotplug.txt b/Documentation/cpu-hotplug.txt
index edd4b4d..786dc82 100644
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
@@ -267,8 +267,8 @@ 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,
- unsigned long action, void *hcpu)
+ static int foobar_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@@ -285,7 +285,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,
};
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 944f283..ab0eade 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -114,7 +114,7 @@ enum {
/* Need to know about CPUs going up/down? */
#if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
#define cpu_notifier(fn, pri) { \
- static struct notifier_block fn##_nb __cpuinitdata = \
+ static struct notifier_block fn##_nb = \
{ .notifier_call = fn, .priority = pri }; \
register_cpu_notifier(&fn##_nb); \
}
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 4ccf846..e36ece2 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -819,7 +819,7 @@ static inline void perf_restore_debug_store(void) { }
*/
#define perf_cpu_notifier(fn) \
do { \
- static struct notifier_block fn##_nb __cpuinitdata = \
+ static struct notifier_block fn##_nb = \
{ .notifier_call = fn, .priority = CPU_PRI_PERF }; \
unsigned long cpu = smp_processor_id(); \
unsigned long flags; \
diff --git a/init/calibrate.c b/init/calibrate.c
index fda0a7b..520702d 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -31,7 +31,7 @@ __setup("lpj=", lpj_setup);
#define DELAY_CALIBRATION_TICKS ((HZ < 100) ? 1 : (HZ/100))
#define MAX_DIRECT_CALIBRATION_RETRIES 5
-static unsigned long __cpuinit calibrate_delay_direct(void)
+static unsigned long calibrate_delay_direct(void)
{
unsigned long pre_start, start, post_start;
unsigned long pre_end, end, post_end;
@@ -166,7 +166,10 @@ static unsigned long __cpuinit calibrate_delay_direct(void)
return 0;
}
#else
-static unsigned long __cpuinit calibrate_delay_direct(void) {return 0;}
+static unsigned long calibrate_delay_direct(void)
+{
+ return 0;
+}
#endif
/*
@@ -180,7 +183,7 @@ static unsigned long __cpuinit calibrate_delay_direct(void) {return 0;}
*/
#define LPS_PREC 8
-static unsigned long __cpuinit calibrate_delay_converge(void)
+static unsigned long calibrate_delay_converge(void)
{
/* First stage - slowly accelerate to find initial bounds */
unsigned long lpj, lpj_base, ticks, loopadd, loopadd_base, chop_limit;
@@ -254,12 +257,12 @@ static DEFINE_PER_CPU(unsigned long, cpu_loops_per_jiffy) = { 0 };
* Architectures should override this function if a faster calibration
* method is available.
*/
-unsigned long __attribute__((weak)) __cpuinit calibrate_delay_is_known(void)
+unsigned long __attribute__((weak)) calibrate_delay_is_known(void)
{
return 0;
}
-void __cpuinit calibrate_delay(void)
+void calibrate_delay(void)
{
unsigned long lpj;
static bool printed;
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 198a388..b2b227b 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -366,7 +366,7 @@ EXPORT_SYMBOL(cpu_down);
#endif /*CONFIG_HOTPLUG_CPU*/
/* Requires cpu_add_remove_lock to be held */
-static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen)
+static int _cpu_up(unsigned int cpu, int tasks_frozen)
{
int ret, nr_calls = 0;
void *hcpu = (void *)(long)cpu;
@@ -419,7 +419,7 @@ out:
return ret;
}
-int __cpuinit cpu_up(unsigned int cpu)
+int cpu_up(unsigned int cpu)
{
int err = 0;
@@ -618,7 +618,7 @@ core_initcall(cpu_hotplug_pm_sync_init);
* It must be called by the arch code on the new cpu, before the new cpu
* enables interrupts and before the "boot" cpu returns from __cpu_up().
*/
-void __cpuinit notify_cpu_starting(unsigned int cpu)
+void notify_cpu_starting(unsigned int cpu)
{
unsigned long val = CPU_STARTING;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 9c89207..3e0cb71 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7524,7 +7524,7 @@ static void __init perf_event_init_all_cpus(void)
}
}
-static void __cpuinit perf_event_init_cpu(int cpu)
+static void perf_event_init_cpu(int cpu)
{
struct swevent_htable *swhash = &per_cpu(swevent_htable, cpu);
@@ -7613,7 +7613,7 @@ static struct notifier_block perf_reboot_notifier = {
.priority = INT_MIN,
};
-static int __cpuinit
+static int
perf_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
{
unsigned int cpu = (long)hcpu;
diff --git a/kernel/fork.c b/kernel/fork.c
index 66635c8..403d2bb 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1546,7 +1546,7 @@ static inline void init_idle_pids(struct pid_link *links)
}
}
-struct task_struct * __cpuinit fork_idle(int cpu)
+struct task_struct *fork_idle(int cpu)
{
struct task_struct *task;
task = copy_process(CLONE_VM, 0, 0, NULL, &init_struct_pid, 0);
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index ef0dd04..95207d8 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1661,7 +1661,7 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
/*
* Functions related to boot-time initialization:
*/
-static void __cpuinit init_hrtimers_cpu(int cpu)
+static void init_hrtimers_cpu(int cpu)
{
struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
int i;
@@ -1742,7 +1742,7 @@ static void migrate_hrtimers(int scpu)
#endif /* CONFIG_HOTPLUG_CPU */
-static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
+static int hrtimer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
int scpu = (long)hcpu;
@@ -1775,7 +1775,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata hrtimers_nb = {
+static struct notifier_block hrtimers_nb = {
.notifier_call = hrtimer_cpu_notify,
};
diff --git a/kernel/printk.c b/kernel/printk.c
index b8c348a..a9cb897 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1922,7 +1922,7 @@ void resume_console(void)
* called when a new CPU comes online (or fails to come up), and ensures
* that any such output gets printed.
*/
-static int __cpuinit console_cpu_notify(struct notifier_block *self,
+static int console_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
switch (action) {
diff --git a/kernel/profile.c b/kernel/profile.c
index 0bf4007..6631e1e 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -331,7 +331,7 @@ out:
put_cpu();
}
-static int __cpuinit profile_cpu_callback(struct notifier_block *info,
+static int profile_cpu_callback(struct notifier_block *info,
unsigned long action, void *__cpu)
{
int node, cpu = (unsigned long)__cpu;
diff --git a/kernel/relay.c b/kernel/relay.c
index e03440b..b915513 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -521,7 +521,7 @@ static void setup_callbacks(struct rchan *chan,
*
* Returns the success/failure of the operation. (%NOTIFY_OK, %NOTIFY_BAD)
*/
-static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
+static int relay_hotcpu_callback(struct notifier_block *nb,
unsigned long action,
void *hcpu)
{
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 195658b..4f5679b 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4138,7 +4138,7 @@ void show_state_filter(unsigned long state_filter)
debug_show_all_locks();
}
-void __cpuinit init_idle_bootup_task(struct task_struct *idle)
+void init_idle_bootup_task(struct task_struct *idle)
{
idle->sched_class = &idle_sched_class;
}
@@ -4151,7 +4151,7 @@ void __cpuinit init_idle_bootup_task(struct task_struct *idle)
* NOTE: this function does not set the idle thread's NEED_RESCHED
* flag, to make booting more robust.
*/
-void __cpuinit init_idle(struct task_struct *idle, int cpu)
+void init_idle(struct task_struct *idle, int cpu)
{
struct rq *rq = cpu_rq(cpu);
unsigned long flags;
@@ -4635,7 +4635,7 @@ static void set_rq_offline(struct rq *rq)
* migration_call - callback that gets triggered when a CPU is added.
* Here we can start up the necessary migration thread for the new CPU.
*/
-static int __cpuinit
+static int
migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
int cpu = (long)hcpu;
@@ -4689,12 +4689,12 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
* happens before everything else. This has to be lower priority than
* the notifier in the perf_event subsystem, though.
*/
-static struct notifier_block __cpuinitdata migration_notifier = {
+static struct notifier_block migration_notifier = {
.notifier_call = migration_call,
.priority = CPU_PRI_MIGRATION,
};
-static int __cpuinit sched_cpu_active(struct notifier_block *nfb,
+static int sched_cpu_active(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
switch (action & ~CPU_TASKS_FROZEN) {
@@ -4707,7 +4707,7 @@ static int __cpuinit sched_cpu_active(struct notifier_block *nfb,
}
}
-static int __cpuinit sched_cpu_inactive(struct notifier_block *nfb,
+static int sched_cpu_inactive(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
switch (action & ~CPU_TASKS_FROZEN) {
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index c0ac2c3..714915a 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5484,7 +5484,7 @@ void nohz_balance_enter_idle(int cpu)
set_bit(NOHZ_TICK_STOPPED, nohz_flags(cpu));
}
-static int __cpuinit sched_ilb_notifier(struct notifier_block *nfb,
+static int sched_ilb_notifier(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
switch (action & ~CPU_TASKS_FROZEN) {
diff --git a/kernel/smp.c b/kernel/smp.c
index 97084cf..02a885d 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -74,7 +74,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata hotplug_cfd_notifier = {
+static struct notifier_block hotplug_cfd_notifier = {
.notifier_call = hotplug_cfd,
};
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index 02fc5c9..eb89e18 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -24,7 +24,7 @@
*/
static DEFINE_PER_CPU(struct task_struct *, idle_threads);
-struct task_struct * __cpuinit idle_thread_get(unsigned int cpu)
+struct task_struct *idle_thread_get(unsigned int cpu)
{
struct task_struct *tsk = per_cpu(idle_threads, cpu);
diff --git a/kernel/softirq.c b/kernel/softirq.c
index ca25e6e..be3d351 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -699,7 +699,7 @@ void send_remote_softirq(struct call_single_data *cp, int cpu, int softirq)
}
EXPORT_SYMBOL(send_remote_softirq);
-static int __cpuinit remote_softirq_cpu_notify(struct notifier_block *self,
+static int remote_softirq_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
/*
@@ -728,7 +728,7 @@ static int __cpuinit remote_softirq_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata remote_softirq_cpu_notifier = {
+static struct notifier_block remote_softirq_cpu_notifier = {
.notifier_call = remote_softirq_cpu_notify,
};
@@ -830,7 +830,7 @@ static void takeover_tasklets(unsigned int cpu)
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __cpuinit cpu_callback(struct notifier_block *nfb,
+static int cpu_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
@@ -845,7 +845,7 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cpu_nfb = {
+static struct notifier_block cpu_nfb = {
.notifier_call = cpu_callback
};
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 0cf1c14..4936910 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -293,7 +293,7 @@ static int __init tick_nohz_full_setup(char *str)
}
__setup("nohz_full=", tick_nohz_full_setup);
-static int __cpuinit tick_nohz_cpu_down_callback(struct notifier_block *nfb,
+static int tick_nohz_cpu_down_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
diff --git a/kernel/timer.c b/kernel/timer.c
index aa8b964..dd65f41 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1501,11 +1501,11 @@ signed long __sched schedule_timeout_uninterruptible(signed long timeout)
}
EXPORT_SYMBOL(schedule_timeout_uninterruptible);
-static int __cpuinit init_timers_cpu(int cpu)
+static int init_timers_cpu(int cpu)
{
int j;
struct tvec_base *base;
- static char __cpuinitdata tvec_base_done[NR_CPUS];
+ static char tvec_base_done[NR_CPUS];
if (!tvec_base_done[cpu]) {
static char boot_done;
@@ -1573,7 +1573,7 @@ static void migrate_timer_list(struct tvec_base *new_base, struct list_head *hea
}
}
-static void __cpuinit migrate_timers(int cpu)
+static void migrate_timers(int cpu)
{
struct tvec_base *old_base;
struct tvec_base *new_base;
@@ -1606,7 +1606,7 @@ static void __cpuinit migrate_timers(int cpu)
}
#endif /* CONFIG_HOTPLUG_CPU */
-static int __cpuinit timer_cpu_notify(struct notifier_block *self,
+static int timer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@ -1631,7 +1631,7 @@ static int __cpuinit timer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata timers_nb = {
+static struct notifier_block timers_nb = {
.notifier_call = timer_cpu_notify,
};
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index f02c4a4..0b72e81 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4644,7 +4644,7 @@ static void restore_unbound_workers_cpumask(struct worker_pool *pool, int cpu)
* Workqueues should be brought up before normal priority CPU notifiers.
* This will be registered high priority CPU notifier.
*/
-static int __cpuinit workqueue_cpu_up_callback(struct notifier_block *nfb,
+static int workqueue_cpu_up_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
@@ -4697,7 +4697,7 @@ static int __cpuinit workqueue_cpu_up_callback(struct notifier_block *nfb,
* Workqueues should be brought down after normal priority CPU notifiers.
* This will be registered as low priority CPU notifier.
*/
-static int __cpuinit workqueue_cpu_down_callback(struct notifier_block *nfb,
+static int workqueue_cpu_down_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 74fdc5c..3a1e279 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -134,7 +134,7 @@ config DEBUG_SECTION_MISMATCH
any use of code/data previously in these sections would
most likely result in an oops.
In the code, functions and variables are annotated with
- __init, __cpuinit, etc. (see the full list in include/linux/init.h),
+ __init,, etc. (see the full list in include/linux/init.h),
which results in the code/data being placed in specific sections.
The section mismatch analysis is always performed after a full
kernel build, and enabling this option causes the following
diff --git a/lib/earlycpio.c b/lib/earlycpio.c
index 8078ef4..7aa7ce2 100644
--- a/lib/earlycpio.c
+++ b/lib/earlycpio.c
@@ -63,7 +63,7 @@ enum cpio_fields {
* the match returned an empty filename string.
*/
-struct cpio_data __cpuinit find_cpio_data(const char *path, void *data,
+struct cpio_data find_cpio_data(const char *path, void *data,
size_t len, long *offset)
{
const size_t cpio_header_len = 8*C_NFIELDS - 2;
diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c
index ba6085d..867f2da 100644
--- a/lib/percpu_counter.c
+++ b/lib/percpu_counter.c
@@ -158,7 +158,7 @@ static void compute_batch_value(void)
percpu_counter_batch = max(32, nr*2);
}
-static int __cpuinit percpu_counter_hotcpu_callback(struct notifier_block *nb,
+static int percpu_counter_hotcpu_callback(struct notifier_block *nb,
unsigned long action, void *hcpu)
{
#ifdef CONFIG_HOTPLUG_CPU
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 64f7265..57dff89 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2540,7 +2540,7 @@ static void mem_cgroup_drain_pcp_counter(struct mem_cgroup *memcg, int cpu)
spin_unlock(&memcg->pcp_counter_lock);
}
-static int __cpuinit memcg_cpu_hotplug_callback(struct notifier_block *nb,
+static int memcg_cpu_hotplug_callback(struct notifier_block *nb,
unsigned long action,
void *hcpu)
{
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 4514ad7..3f0c895 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -1619,7 +1619,7 @@ void writeback_set_ratelimit(void)
ratelimit_pages = 16;
}
-static int __cpuinit
+static int
ratelimit_handler(struct notifier_block *self, unsigned long action,
void *hcpu)
{
@@ -1634,7 +1634,7 @@ ratelimit_handler(struct notifier_block *self, unsigned long action,
}
}
-static struct notifier_block __cpuinitdata ratelimit_nb = {
+static struct notifier_block ratelimit_nb = {
.notifier_call = ratelimit_handler,
.next = NULL,
};
diff --git a/mm/slab.c b/mm/slab.c
index be12f68..17298c1 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -787,7 +787,7 @@ static void next_reap_node(void)
* the CPUs getting into lockstep and contending for the global cache chain
* lock.
*/
-static void __cpuinit start_cpu_timer(int cpu)
+static void start_cpu_timer(int cpu)
{
struct delayed_work *reap_work = &per_cpu(slab_reap_work, cpu);
@@ -1180,7 +1180,7 @@ static int init_cache_node_node(int node)
return 0;
}
-static void __cpuinit cpuup_canceled(long cpu)
+static void cpuup_canceled(long cpu)
{
struct kmem_cache *cachep;
struct kmem_cache_node *n = NULL;
@@ -1245,7 +1245,7 @@ free_array_cache:
}
}
-static int __cpuinit cpuup_prepare(long cpu)
+static int cpuup_prepare(long cpu)
{
struct kmem_cache *cachep;
struct kmem_cache_node *n = NULL;
@@ -1328,7 +1328,7 @@ bad:
return -ENOMEM;
}
-static int __cpuinit cpuup_callback(struct notifier_block *nfb,
+static int cpuup_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@ -1384,7 +1384,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
return notifier_from_errno(err);
}
-static struct notifier_block __cpuinitdata cpucache_notifier = {
+static struct notifier_block cpucache_notifier = {
&cpuup_callback, NULL, 0
};
diff --git a/mm/slub.c b/mm/slub.c
index 57707f0..4649ff0 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3755,7 +3755,7 @@ int __kmem_cache_create(struct kmem_cache *s, unsigned long flags)
* Use the cpu notifier to insure that the cpu slabs are flushed when
* necessary.
*/
-static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb,
+static int slab_cpuup_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
long cpu = (long)hcpu;
@@ -3781,7 +3781,7 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata slab_notifier = {
+static struct notifier_block slab_notifier = {
.notifier_call = slab_cpuup_callback
};
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 7a35116..58e5b3c 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1189,7 +1189,7 @@ static void vmstat_update(struct work_struct *w)
round_jiffies_relative(sysctl_stat_interval));
}
-static void __cpuinit start_cpu_timer(int cpu)
+static void start_cpu_timer(int cpu)
{
struct delayed_work *work = &per_cpu(vmstat_work, cpu);
@@ -1201,7 +1201,7 @@ static void __cpuinit start_cpu_timer(int cpu)
* Use the cpu notifier to insure that the thresholds are recalculated
* when necessary.
*/
-static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
+static int vmstat_cpuup_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
@@ -1233,7 +1233,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata vmstat_notifier =
+static struct notifier_block vmstat_notifier =
{ &vmstat_cpuup_callback, NULL, 0 };
#endif
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* [PATCH 31/32] drivers: delete __cpuinit usage from all remaining drivers files
2013-06-24 19:30 ` Paul Gortmaker
` (33 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
2013-06-24 20:33 ` Greg Kroah-Hartman
-1 siblings, 1 reply; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Greg Kroah-Hartman
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the remaining one-off uses of the __cpuinit macros
from all C files in the drivers/* directory.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
drivers/base/cpu.c | 2 +-
drivers/base/topology.c | 10 +++++-----
drivers/oprofile/timer_int.c | 4 ++--
drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index b9f0eec..89640eb 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -271,7 +271,7 @@ static void cpu_device_release(struct device *dev)
*
* Initialize and register the CPU device.
*/
-int __cpuinit register_cpu(struct cpu *cpu, int num)
+int register_cpu(struct cpu *cpu, int num)
{
int error;
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index ae989c5..2f5919e 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -143,22 +143,22 @@ static struct attribute_group topology_attr_group = {
};
/* Add/Remove cpu_topology interface for CPU device */
-static int __cpuinit topology_add_dev(unsigned int cpu)
+static int topology_add_dev(unsigned int cpu)
{
struct device *dev = get_cpu_device(cpu);
return sysfs_create_group(&dev->kobj, &topology_attr_group);
}
-static void __cpuinit topology_remove_dev(unsigned int cpu)
+static void topology_remove_dev(unsigned int cpu)
{
struct device *dev = get_cpu_device(cpu);
sysfs_remove_group(&dev->kobj, &topology_attr_group);
}
-static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
- unsigned long action, void *hcpu)
+static int topology_cpu_callback(struct notifier_block *nfb,
+ unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
int rc = 0;
@@ -178,7 +178,7 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
return notifier_from_errno(rc);
}
-static int __cpuinit topology_sysfs_init(void)
+static int topology_sysfs_init(void)
{
int cpu;
int rc;
diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 93404f7..61be1d9 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -74,8 +74,8 @@ static void oprofile_hrtimer_stop(void)
put_online_cpus();
}
-static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int oprofile_cpu_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
long cpu = (long) hcpu;
diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c
index 18c742b..b7d5d95 100644
--- a/drivers/xen/xen-acpi-cpuhotplug.c
+++ b/drivers/xen/xen-acpi-cpuhotplug.c
@@ -89,7 +89,7 @@ static int xen_acpi_processor_enable(struct acpi_device *device)
return 0;
}
-static int __cpuinit xen_acpi_processor_add(struct acpi_device *device)
+static int xen_acpi_processor_add(struct acpi_device *device)
{
int ret;
struct acpi_processor *pr;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread* Re: [PATCH 31/32] drivers: delete __cpuinit usage from all remaining drivers files
2013-06-24 19:30 ` [PATCH 31/32] drivers: delete __cpuinit usage from all remaining drivers files Paul Gortmaker
@ 2013-06-24 20:33 ` Greg Kroah-Hartman
0 siblings, 0 replies; 88+ messages in thread
From: Greg Kroah-Hartman @ 2013-06-24 20:33 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-kernel
On Mon, Jun 24, 2013 at 03:30:36PM -0400, Paul Gortmaker wrote:
> The __cpuinit type of throwaway sections might have made sense
> some time ago when RAM was more constrained, but now the savings
> do not offset the cost and complications. For example, the fix in
> commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
> is a good example of the nasty type of bugs that can be created
> with improper use of the various __init prefixes.
>
> After a discussion on LKML[1] it was decided that cpuinit should go
> the way of devinit and be phased out. Once all the users are gone,
> we can then finally remove the macros themselves from linux/init.h.
>
> This removes all the remaining one-off uses of the __cpuinit macros
> from all C files in the drivers/* directory.
>
> [1] https://lkml.org/lkml/2013/5/20/589
>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH 32/32] block: delete __cpuinit usage from all block files
2013-06-24 19:30 ` Paul Gortmaker
` (34 preceding siblings ...)
(?)
@ 2013-06-24 19:30 ` Paul Gortmaker
-1 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 19:30 UTC (permalink / raw)
To: linux-kernel; +Cc: Paul Gortmaker, Jens Axboe
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
This removes all the drivers/block uses of the __cpuinit macros
from all C files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[This commit is part of the __cpuinit removal work. If you don't see
any problems with it, then you don't have to do anything ; it will be
submitted with all the rest of the __cpuinit removal work. On the
other hand, if you want to carry this patch in with your other pending
changes so as to handle conflicts with other pending work yourself, then
that is fine too, as the commits can largely be treated independently.
For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]
block/blk-iopoll.c | 6 +++---
block/blk-softirq.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
index 58916af..4b8d9b54 100644
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
@@ -189,8 +189,8 @@ void blk_iopoll_init(struct blk_iopoll *iop, int weight, blk_iopoll_fn *poll_fn)
}
EXPORT_SYMBOL(blk_iopoll_init);
-static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int blk_iopoll_cpu_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
{
/*
* If a CPU goes away, splice its entries to the current CPU
@@ -209,7 +209,7 @@ static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata blk_iopoll_cpu_notifier = {
+static struct notifier_block blk_iopoll_cpu_notifier = {
.notifier_call = blk_iopoll_cpu_notify,
};
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 467c8de..ec9e606 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -78,8 +78,8 @@ static int raise_blk_irq(int cpu, struct request *rq)
}
#endif
-static int __cpuinit blk_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
+static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
+ void *hcpu)
{
/*
* If a CPU goes away, splice its entries to the current CPU
@@ -98,7 +98,7 @@ static int __cpuinit blk_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata blk_cpu_notifier = {
+static struct notifier_block blk_cpu_notifier = {
.notifier_call = blk_cpu_notify,
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 88+ messages in thread[parent not found: <1372102237-8757-1-git-send-email-paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>]
* [PATCH-next 00/32] Delete support for __cpuinit
[not found] ` <1372102237-8757-1-git-send-email-paul.gortmaker-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org>
` (4 preceding siblings ...)
(?)
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-ia64-u79uwXL29TY76Z2rM5mHXA,
linux-parisc-u79uwXL29TY76Z2rM5mHXA,
linux-cris-kernel-VrBV9hrLPhE, linux-pm-u79uwXL29TY76Z2rM5mHXA,
linux-sh-u79uwXL29TY76Z2rM5mHXA,
linux-hexagon-u79uwXL29TY76Z2rM5mHXA,
linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw,
linux390-tA70FqPdS9bQT0dZR+AlfA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cpufreq-u79uwXL29TY76Z2rM5mHXA, lm-sensors-GZX6beZjE8VD60Wz+7aTrA,
linux-acpi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
sparclinux-u79uwXL29TY76Z2rM5mHXA,
uclinux-dist-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b,
x86-DgEjT+Ai2ygdnm+yROfE0A, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: "Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>
> Cc: Richard Henderson <rth-hL46jP5Bxq7R7s880joybQ@public.gmane.org>
> Cc: Ivan Kokshaysky <ink-biIs/Y0ymYJMZLIVYojuPNP0rXTJTi09@public.gmane.org>
> Cc: Matt Turner <mattst88-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Vineet Gupta <vgupta-HKixBCOQz3hWk0Htik3J/w@public.gmane.org>
> Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
> Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
> Cc: Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>
> Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
> Cc: Mike Frysinger <vapier-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
> Cc: Bob Liu <lliubbo-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Sonic Zhang <sonic.zhang-OyLXuOCK7orQT0dZR+AlfA@public.gmane.org>
> Cc: Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>
> Cc: John Stultz <john.stultz-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> Cc: "Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>
> Cc: Viresh Kumar <viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Cc: Mikael Starvik <starvik-VrBV9hrLPhE@public.gmane.org>
> Cc: Jesper Nilsson <jesper.nilsson-VrBV9hrLPhE@public.gmane.org>
> Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
> Cc: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: Richard Kuo <rkuo-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
> Cc: Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Cc: Tony Luck <tony.luck-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Cc: Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Cc: Hirokazu Takata <takata-TMSiXQfHlQjsTix1lMzHGQ@public.gmane.org>
> Cc: James Hogan <james.hogan-1AXoQHu6uovQT0dZR+AlfA@public.gmane.org>
> Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
> Cc: Rusty Russell <rusty-8n+1lVoiYb80n/F98K4Iww@public.gmane.org>
> Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
> Cc: Jonas Bonn <jonas-A9uVI2HLR7kOP4wsBPIw7w@public.gmane.org>
> Cc: Helge Deller <deller-Mmb7MZpHnFY@public.gmane.org>
> Cc: Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
> Cc: Paul Mackerras <paulus-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>
> Cc: Josh Boyer <jwboyer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Matt Porter <mporter-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
> Cc: Kumar Gala <galak-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>
> Cc: "Paul E. McKenney" <paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> Cc: Josh Triplett <josh-CC+yJ3UmIYqDUpFQwHEjaQ@public.gmane.org>
> Cc: Dipankar Sarma <dipankar-xthvdsQ13ZrQT0dZR+AlfA@public.gmane.org>
> Cc: Martin Schwidefsky <schwidefsky-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
> Cc: Heiko Carstens <heiko.carstens-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org>
> Cc: Chen Liqin <liqin.chen-+XGAvkf1AAHby3iVrkZq2A@public.gmane.org>
> Cc: Lennox Wu <lennox.wu-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Paul Mundt <lethal-M7jkjyW5wf5g9hUCZPvPmw@public.gmane.org>
> Cc: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
> Cc: Chris Metcalf <cmetcalf-kv+TWInifGbQT0dZR+AlfA@public.gmane.org>
> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
> Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
> Cc: Chris Zankel <chris-YvXeqwSYzG2sTnJN9+BGXg@public.gmane.org>
> Cc: Max Filippov <jcmvbkbc-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: uclinux-dist-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b@public.gmane.org
> Cc: cpufreq-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-pm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-cris-kernel-VrBV9hrLPhE@public.gmane.org
> Cc: linux-hexagon-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: lm-sensors-GZX6beZjE8VD60Wz+7aTrA@public.gmane.org
> Cc: linux-ia64-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy@public.gmane.org
> Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy@public.gmane.org
> Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-ZwoEplunGu2h2975yA52AaxOck334EZe@public.gmane.org
> Cc: linux-parisc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
> Cc: linux390-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org
> Cc: linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
> Cc: linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw@public.gmane.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
^ permalink raw reply [flat|nested] 88+ messages in thread* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel, linux-acpi, linux-arm-kernel, uclinux-dist-devel,
cpufreq, linux-pm, linux-cris-kernel, linux-hexagon, lm-sensors,
linux-ia64, linux-m32r, linux-m32r-ja, netdev, linux-parisc,
linuxppc-dev, linux390, linux-s390, linux-sh, sparclinux, x86,
linux-xtensa
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Bob Liu <lliubbo@gmail.com>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Helge Deller <deller@gmx.de>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Josh Boyer <jwboyer@gmail.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-acpi@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: uclinux-dist-devel@blackfin.uclinux.org
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-cris-kernel@axis.com
> Cc: linux-hexagon@vger.kernel.org
> Cc: lm-sensors@lm-sensors.org
> Cc: linux-ia64@vger.kernel.org
> Cc: linux-m32r@ml.linux-m32r.org
> Cc: linux-m32r-ja@ml.linux-m32r.org
> Cc: netdev@vger.kernel.org
> Cc: linux@lists.openrisc.net
> Cc: linux-parisc@vger.kernel.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux390@de.ibm.com
> Cc: linux-s390@vger.kernel.org
> Cc: linux-sh@vger.kernel.org
> Cc: sparclinux@vger.kernel.org
> Cc: x86@kernel.org
> Cc: linux-xtensa@linux-xtensa.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: linux-arm-kernel
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Bob Liu <lliubbo@gmail.com>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Helge Deller <deller@gmx.de>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Josh Boyer <jwboyer@gmail.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-acpi at vger.kernel.org
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: uclinux-dist-devel at blackfin.uclinux.org
> Cc: cpufreq at vger.kernel.org
> Cc: linux-pm at vger.kernel.org
> Cc: linux-cris-kernel at axis.com
> Cc: linux-hexagon at vger.kernel.org
> Cc: lm-sensors at lm-sensors.org
> Cc: linux-ia64 at vger.kernel.org
> Cc: linux-m32r at ml.linux-m32r.org
> Cc: linux-m32r-ja at ml.linux-m32r.org
> Cc: netdev at vger.kernel.org
> Cc: linux at lists.openrisc.net
> Cc: linux-parisc at vger.kernel.org
> Cc: linuxppc-dev at lists.ozlabs.org
> Cc: linux390 at de.ibm.com
> Cc: linux-s390 at vger.kernel.org
> Cc: linux-sh at vger.kernel.org
> Cc: sparclinux at vger.kernel.org
> Cc: x86 at kernel.org
> Cc: linux-xtensa at linux-xtensa.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-m32r-ja, linux-s390, linux-m32r, linux-ia64, linux-parisc,
linux-cris-kernel, linux-pm, linux-sh, linux-hexagon,
linux-xtensa, linux390, linux-kernel, cpufreq, lm-sensors,
linux-acpi, netdev, sparclinux, uclinux-dist-devel, x86,
linuxppc-dev, linux-arm-kernel
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Bob Liu <lliubbo@gmail.com>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Helge Deller <deller@gmx.de>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Josh Boyer <jwboyer@gmail.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-acpi@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: uclinux-dist-devel@blackfin.uclinux.org
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-cris-kernel@axis.com
> Cc: linux-hexagon@vger.kernel.org
> Cc: lm-sensors@lm-sensors.org
> Cc: linux-ia64@vger.kernel.org
> Cc: linux-m32r@ml.linux-m32r.org
> Cc: linux-m32r-ja@ml.linux-m32r.org
> Cc: netdev@vger.kernel.org
> Cc: linux@lists.openrisc.net
> Cc: linux-parisc@vger.kernel.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux390@de.ibm.com
> Cc: linux-s390@vger.kernel.org
> Cc: linux-sh@vger.kernel.org
> Cc: sparclinux@vger.kernel.org
> Cc: x86@kernel.org
> Cc: linux-xtensa@linux-xtensa.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [lm-sensors] [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-ia64-u79uwXL29TY76Z2rM5mHXA,
linux-parisc-u79uwXL29TY76Z2rM5mHXA,
linux-cris-kernel-VrBV9hrLPhE, linux-pm-u79uwXL29TY76Z2rM5mHXA,
linux-sh-u79uwXL29TY76Z2rM5mHXA,
linux-hexagon-u79uwXL29TY76Z2rM5mHXA,
linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw,
linux390-tA70FqPdS9bQT0dZR+AlfA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cpufreq-u79uwXL29TY76Z2rM5mHXA, lm-sensors-GZX6beZjE8VD60Wz+7aTrA,
linux-acpi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
sparclinux-u79uwXL29TY76Z2rM5mHXA,
uclinux-dist-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b,
x86-DgEjT+Ai2ygdnm+yROfE0A, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Bob Liu <lliubbo@gmail.com>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Helge Deller <deller@gmx.de>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Josh Boyer <jwboyer@gmail.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-acpi@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: uclinux-dist-devel@blackfin.uclinux.org
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-cris-kernel@axis.com
> Cc: linux-hexagon@vger.kernel.org
> Cc: lm-sensors@lm-sensors.org
> Cc: linux-ia64@vger.kernel.org
> Cc: linux-m32r@ml.linux-m32r.org
> Cc: linux-m32r-ja@ml.linux-m32r.org
> Cc: netdev@vger.kernel.org
> Cc: linux@lists.openrisc.net
> Cc: linux-parisc@vger.kernel.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux390@de.ibm.com
> Cc: linux-s390@vger.kernel.org
> Cc: linux-sh@vger.kernel.org
> Cc: sparclinux@vger.kernel.org
> Cc: x86@kernel.org
> Cc: linux-xtensa@linux-xtensa.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-kernel, linux-acpi, linux-arm-kernel, uclinux-dist-devel,
cpufreq, linux-pm, linux-cris-kernel, linux-hexagon, lm-sensors,
linux-ia64, linux-m32r, linux-m32r-ja, netdev, linux-parisc,
linuxppc-dev, linux390, linux-s390, linux-sh, sparclinux, x86,
linux-xtensa
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Bob Liu <lliubbo@gmail.com>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Helge Deller <deller@gmx.de>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Josh Boyer <jwboyer@gmail.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-acpi@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: uclinux-dist-devel@blackfin.uclinux.org
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-cris-kernel@axis.com
> Cc: linux-hexagon@vger.kernel.org
> Cc: lm-sensors@lm-sensors.org
> Cc: linux-ia64@vger.kernel.org
> Cc: linux-m32r@ml.linux-m32r.org
> Cc: linux-m32r-ja@ml.linux-m32r.org
> Cc: netdev@vger.kernel.org
> Cc: linux@lists.openrisc.net
> Cc: linux-parisc@vger.kernel.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux390@de.ibm.com
> Cc: linux-s390@vger.kernel.org
> Cc: linux-sh@vger.kernel.org
> Cc: sparclinux@vger.kernel.org
> Cc: x86@kernel.org
> Cc: linux-xtensa@linux-xtensa.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
^ permalink raw reply [flat|nested] 88+ messages in thread
* [PATCH-next 00/32] Delete support for __cpuinit
@ 2013-06-24 20:00 ` Paul Gortmaker
0 siblings, 0 replies; 88+ messages in thread
From: Paul Gortmaker @ 2013-06-24 20:00 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-m32r-ja-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-s390-u79uwXL29TY76Z2rM5mHXA,
linux-m32r-rQhvJZKUsGBRYuoOT4C5/9i2O/JbrIOy,
linux-ia64-u79uwXL29TY76Z2rM5mHXA,
linux-parisc-u79uwXL29TY76Z2rM5mHXA,
linux-cris-kernel-VrBV9hrLPhE, linux-pm-u79uwXL29TY76Z2rM5mHXA,
linux-sh-u79uwXL29TY76Z2rM5mHXA,
linux-hexagon-u79uwXL29TY76Z2rM5mHXA,
linux-xtensa-PjhNF2WwrV/0Sa2dR60CXw,
linux390-tA70FqPdS9bQT0dZR+AlfA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cpufreq-u79uwXL29TY76Z2rM5mHXA, lm-sensors-GZX6beZjE8VD60Wz+7aTrA,
linux-acpi-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
sparclinux-u79uwXL29TY76Z2rM5mHXA,
uclinux-dist-devel-ZG0+EudsQA8dtHy/vicBwGD2FQJk+8+b,
x86-DgEjT+Ai2ygdnm+yROfE0A, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
[Resending with only lists on Cc: -- previous mail header on the 00/32
was too long; failed to get passed vger's crap filters.]
On 13-06-24 03:30 PM, Paul Gortmaker wrote:
> This is the whole patch queue for removal of __cpuinit support
> against the latest linux-next tree (Jun24th). Some of you may
> have already seen chunks of it, or already read the logistics
> of what is being done (and why) here:
>
> https://lkml.org/lkml/2013/6/20/513
>
> I won't repeat all that here again, other than to say this send
> is to ensure arch/subsystem maintainers get a 2nd chance to know
> what is going on and to look at what is being proposed for their
> area of code. That, and to ensure one complete continuous copy
> of it gets mailed out. You can also see the patch queue here:
>
> http://git.kernel.org/cgit/linux/kernel/git/paulg/cpuinit-delete.git
>
> If you've noticed that a chunk for MIPS isn't present here, that
> is because it has already been queued in the linux-mips for-next
> branch.
>
> Thanks,
> Paul.
>
> ---
> Cc: Len Brown <lenb@kernel.org>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
> Cc: Matt Turner <mattst88@gmail.com>
> Cc: Vineet Gupta <vgupta@synopsys.com>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mike Frysinger <vapier@gentoo.org>
> Cc: Bob Liu <lliubbo@gmail.com>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: John Stultz <john.stultz@linaro.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: David Howells <dhowells@redhat.com>
> Cc: Richard Kuo <rkuo@codeaurora.org>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Tony Luck <tony.luck@intel.com>
> Cc: Fenghua Yu <fenghua.yu@intel.com>
> Cc: Hirokazu Takata <takata@linux-m32r.org>
> Cc: James Hogan <james.hogan@imgtec.com>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jonas Bonn <jonas@southpole.se>
> Cc: Helge Deller <deller@gmx.de>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Josh Boyer <jwboyer@gmail.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: Josh Triplett <josh@freedesktop.org>
> Cc: Dipankar Sarma <dipankar@in.ibm.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Cc: Chen Liqin <liqin.chen@sunplusct.com>
> Cc: Lennox Wu <lennox.wu@gmail.com>
> Cc: Paul Mundt <lethal@linux-sh.org>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Chris Metcalf <cmetcalf@tilera.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-acpi@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: uclinux-dist-devel@blackfin.uclinux.org
> Cc: cpufreq@vger.kernel.org
> Cc: linux-pm@vger.kernel.org
> Cc: linux-cris-kernel@axis.com
> Cc: linux-hexagon@vger.kernel.org
> Cc: lm-sensors@lm-sensors.org
> Cc: linux-ia64@vger.kernel.org
> Cc: linux-m32r@ml.linux-m32r.org
> Cc: linux-m32r-ja@ml.linux-m32r.org
> Cc: netdev@vger.kernel.org
> Cc: linux@lists.openrisc.net
> Cc: linux-parisc@vger.kernel.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux390@de.ibm.com
> Cc: linux-s390@vger.kernel.org
> Cc: linux-sh@vger.kernel.org
> Cc: sparclinux@vger.kernel.org
> Cc: x86@kernel.org
> Cc: linux-xtensa@linux-xtensa.org
>
> Paul Gortmaker (32):
> init.h: remove __cpuinit sections from the kernel
> modpost: remove all traces of cpuinit/cpuexit sections
> alpha: delete __cpuinit usage from all users
> powerpc: delete __cpuinit usage from all users
> parisc: delete __cpuinit usage from all users
> ia64: delete __cpuinit usage from all ia64 users
> arm: delete __cpuinit/__CPUINIT usage from all ARM users
> sparc: delete __cpuinit/__CPUINIT usage from all users
> arm64: delete __cpuinit usage from all users
> arc: delete __cpuinit usage from all arc files
> blackfin: delete __cpuinit usage from all blackfin files
> s390: delete __cpuinit usage from all s390 files
> sh: delete __cpuinit usage from all sh files
> tile: delete __cpuinit usage from all tile files
> metag: delete __cpuinit usage from all metag files
> cris: delete __cpuinit usage from all cris files
> frv: delete __cpuinit usage from all frv files
> hexagon: delete __cpuinit usage from all hexagon files
> m32r: delete __cpuinit usage from all m32r files
> openrisc: delete __cpuinit usage from all openrisc files
> xtensa: delete __cpuinit usage from all xtensa files
> score: delete __cpuinit usage from all score files
> x86: delete __cpuinit usage from all x86 files
> clocksource+irqchip: delete __cpuinit usage from all related files
> cpufreq: delete __cpuinit usage from all cpufreq files
> hwmon: delete __cpuinit usage from all hwmon files
> acpi: delete __cpuinit usage from all acpi files
> net: delete __cpuinit usage from all net files
> rcu: delete __cpuinit usage from all rcu files
> kernel: delete __cpuinit usage from all core kernel files
> drivers: delete __cpuinit usage from all remaining drivers files
> block: delete __cpuinit usage from all block files
>
> Documentation/cpu-hotplug.txt | 6 +--
> arch/alpha/kernel/smp.c | 10 ++---
> arch/alpha/kernel/traps.c | 4 +-
> arch/arc/include/asm/irq.h | 2 +-
> arch/arc/kernel/irq.c | 2 +-
> arch/arc/kernel/setup.c | 10 ++---
> arch/arc/kernel/smp.c | 4 +-
> arch/arc/kernel/time.c | 6 +--
> arch/arc/mm/cache_arc700.c | 4 +-
> arch/arc/mm/tlb.c | 4 +-
> arch/arm/common/mcpm_platsmp.c | 4 +-
> arch/arm/include/asm/arch_timer.h | 2 +-
> arch/arm/kernel/head-common.S | 1 -
> arch/arm/kernel/head.S | 1 -
> arch/arm/kernel/hw_breakpoint.c | 4 +-
> arch/arm/kernel/perf_event_cpu.c | 6 +--
> arch/arm/kernel/psci_smp.c | 3 +-
> arch/arm/kernel/smp.c | 18 ++++----
> arch/arm/kernel/smp_twd.c | 6 +--
> arch/arm/lib/delay.c | 2 +-
> arch/arm/mach-exynos/headsmp.S | 2 -
> arch/arm/mach-exynos/platsmp.c | 4 +-
> arch/arm/mach-highbank/platsmp.c | 2 +-
> arch/arm/mach-imx/platsmp.c | 2 +-
> arch/arm/mach-msm/headsmp.S | 2 -
> arch/arm/mach-msm/platsmp.c | 6 +--
> arch/arm/mach-msm/timer.c | 4 +-
> arch/arm/mach-mvebu/coherency.c | 2 +-
> arch/arm/mach-mvebu/headsmp.S | 2 -
> arch/arm/mach-mvebu/platsmp.c | 5 +--
> arch/arm/mach-omap2/omap-headsmp.S | 2 -
> arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +-
> arch/arm/mach-omap2/omap-smp.c | 4 +-
> arch/arm/mach-omap2/omap-wakeupgen.c | 4 +-
> arch/arm/mach-prima2/headsmp.S | 2 -
> arch/arm/mach-prima2/platsmp.c | 4 +-
> arch/arm/mach-shmobile/headsmp-scu.S | 1 -
> arch/arm/mach-shmobile/headsmp.S | 2 -
> arch/arm/mach-shmobile/smp-emev2.c | 2 +-
> arch/arm/mach-shmobile/smp-r8a7779.c | 2 +-
> arch/arm/mach-shmobile/smp-sh73a0.c | 2 +-
> arch/arm/mach-socfpga/headsmp.S | 1 -
> arch/arm/mach-socfpga/platsmp.c | 2 +-
> arch/arm/mach-spear/generic.h | 2 +-
> arch/arm/mach-spear/platsmp.c | 4 +-
> arch/arm/mach-tegra/platsmp.c | 4 +-
> arch/arm/mach-tegra/pm.c | 2 +-
> arch/arm/mach-ux500/platsmp.c | 4 +-
> arch/arm/mach-zynq/common.h | 2 +-
> arch/arm/mach-zynq/headsmp.S | 2 -
> arch/arm/mach-zynq/platsmp.c | 6 +--
> arch/arm/mm/proc-arm1020.S | 2 -
> arch/arm/mm/proc-arm1020e.S | 2 -
> arch/arm/mm/proc-arm1022.S | 2 -
> arch/arm/mm/proc-arm1026.S | 3 --
> arch/arm/mm/proc-arm720.S | 2 -
> arch/arm/mm/proc-arm740.S | 2 -
> arch/arm/mm/proc-arm7tdmi.S | 2 -
> arch/arm/mm/proc-arm920.S | 2 -
> arch/arm/mm/proc-arm922.S | 2 -
> arch/arm/mm/proc-arm925.S | 2 -
> arch/arm/mm/proc-arm926.S | 2 -
> arch/arm/mm/proc-arm940.S | 2 -
> arch/arm/mm/proc-arm946.S | 2 -
> arch/arm/mm/proc-arm9tdmi.S | 2 -
> arch/arm/mm/proc-fa526.S | 2 -
> arch/arm/mm/proc-feroceon.S | 2 -
> arch/arm/mm/proc-mohawk.S | 2 -
> arch/arm/mm/proc-sa110.S | 2 -
> arch/arm/mm/proc-sa1100.S | 2 -
> arch/arm/mm/proc-v6.S | 2 -
> arch/arm/mm/proc-v7-2level.S | 4 --
> arch/arm/mm/proc-v7-3level.S | 4 --
> arch/arm/mm/proc-v7.S | 2 -
> arch/arm/mm/proc-xsc3.S | 2 -
> arch/arm/mm/proc-xscale.S | 2 -
> arch/arm/plat-versatile/platsmp.c | 6 +--
> arch/arm64/include/asm/arch_timer.h | 2 +-
> arch/arm64/kernel/debug-monitors.c | 6 +--
> arch/arm64/kernel/hw_breakpoint.c | 4 +-
> arch/arm64/kernel/smp.c | 8 ++--
> arch/blackfin/kernel/perf_event.c | 2 +-
> arch/blackfin/kernel/setup.c | 4 +-
> arch/blackfin/mach-bf561/smp.c | 6 +--
> arch/blackfin/mach-common/cache-c.c | 4 +-
> arch/blackfin/mach-common/ints-priority.c | 2 +-
> arch/blackfin/mach-common/smp.c | 8 ++--
> arch/cris/arch-v32/kernel/smp.c | 2 +-
> arch/frv/kernel/setup.c | 2 +-
> arch/hexagon/kernel/setup.c | 2 +-
> arch/hexagon/kernel/smp.c | 4 +-
> arch/ia64/kernel/acpi.c | 4 +-
> 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 | 8 ++--
> arch/ia64/kernel/topology.c | 18 ++++----
> arch/ia64/mm/contig.c | 3 +-
> arch/ia64/mm/discontig.c | 2 +-
> arch/ia64/mm/numa.c | 2 +-
> arch/ia64/sn/kernel/setup.c | 8 ++--
> arch/ia64/xen/hypervisor.c | 2 +-
> arch/m32r/kernel/smpboot.c | 2 +-
> arch/metag/kernel/perf/perf_event.c | 6 +--
> arch/metag/kernel/smp.c | 16 +++----
> arch/metag/kernel/traps.c | 2 +-
> arch/openrisc/kernel/setup.c | 2 +-
> arch/parisc/kernel/firmware.c | 14 +++---
> arch/parisc/kernel/hardware.c | 2 +-
> arch/parisc/kernel/processor.c | 6 +--
> arch/parisc/kernel/smp.c | 8 ++--
> arch/powerpc/include/asm/rtas.h | 4 +-
> arch/powerpc/include/asm/vdso.h | 2 +-
> arch/powerpc/kernel/cacheinfo.c | 36 ++++++++-------
> arch/powerpc/kernel/rtas.c | 4 +-
> arch/powerpc/kernel/smp.c | 4 +-
> arch/powerpc/kernel/sysfs.c | 6 +--
> arch/powerpc/kernel/time.c | 1 -
> arch/powerpc/kernel/vdso.c | 2 +-
> arch/powerpc/mm/44x_mmu.c | 6 +--
> arch/powerpc/mm/hash_utils_64.c | 2 +-
> arch/powerpc/mm/mmu_context_nohash.c | 6 +--
> arch/powerpc/mm/numa.c | 7 ++-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/powerpc/perf/core-book3s.c | 4 +-
> arch/powerpc/platforms/44x/currituck.c | 4 +-
> arch/powerpc/platforms/44x/iss4xx.c | 4 +-
> arch/powerpc/platforms/85xx/smp.c | 6 +--
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> arch/powerpc/platforms/powernv/smp.c | 2 +-
> arch/s390/kernel/cache.c | 15 +++----
> arch/s390/kernel/perf_cpum_cf.c | 4 +-
> arch/s390/kernel/processor.c | 2 +-
> arch/s390/kernel/smp.c | 17 ++++---
> arch/s390/kernel/sysinfo.c | 2 +-
> arch/s390/kernel/vtime.c | 6 +--
> arch/s390/mm/fault.c | 4 +-
> arch/score/mm/tlb-score.c | 2 +-
> arch/sh/kernel/cpu/init.c | 18 ++++----
> arch/sh/kernel/cpu/sh2/probe.c | 2 +-
> arch/sh/kernel/cpu/sh2a/probe.c | 2 +-
> arch/sh/kernel/cpu/sh3/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4/probe.c | 2 +-
> arch/sh/kernel/cpu/sh4a/smp-shx3.c | 6 +--
> arch/sh/kernel/cpu/sh5/probe.c | 2 +-
> arch/sh/kernel/perf_event.c | 4 +-
> arch/sh/kernel/process.c | 2 +-
> arch/sh/kernel/setup.c | 2 +-
> arch/sh/kernel/smp.c | 8 ++--
> arch/sh/kernel/traps_32.c | 2 +-
> arch/sh/kernel/traps_64.c | 2 +-
> arch/sh/mm/tlb-sh5.c | 2 +-
> arch/sparc/kernel/ds.c | 11 ++---
> arch/sparc/kernel/entry.h | 2 +-
> arch/sparc/kernel/hvtramp.S | 1 -
> arch/sparc/kernel/irq_64.c | 5 ++-
> arch/sparc/kernel/leon_smp.c | 10 ++---
> arch/sparc/kernel/mdesc.c | 34 +++++++-------
> arch/sparc/kernel/smp_32.c | 20 ++++-----
> arch/sparc/kernel/smp_64.c | 9 ++--
> arch/sparc/kernel/sun4d_smp.c | 6 +--
> arch/sparc/kernel/sun4m_smp.c | 6 +--
> arch/sparc/kernel/sysfs.c | 4 +-
> arch/sparc/kernel/trampoline_32.S | 3 --
> arch/sparc/kernel/trampoline_64.S | 2 -
> arch/sparc/mm/init_64.c | 2 +-
> arch/sparc/mm/srmmu.c | 12 ++---
> arch/tile/kernel/irq.c | 2 +-
> arch/tile/kernel/messaging.c | 2 +-
> arch/tile/kernel/setup.c | 12 ++---
> arch/tile/kernel/smpboot.c | 8 ++--
> arch/tile/kernel/time.c | 2 +-
> arch/x86/include/asm/cpu.h | 2 +-
> arch/x86/include/asm/microcode.h | 4 +-
> arch/x86/include/asm/microcode_intel.h | 4 +-
> arch/x86/include/asm/mmconfig.h | 4 +-
> arch/x86/include/asm/mpspec.h | 2 +-
> arch/x86/include/asm/numa.h | 6 +--
> arch/x86/include/asm/prom.h | 2 +-
> arch/x86/include/asm/smp.h | 2 +-
> arch/x86/kernel/acpi/boot.c | 6 +--
> arch/x86/kernel/apic/apic.c | 30 ++++++-------
> arch/x86/kernel/apic/apic_numachip.c | 2 +-
> arch/x86/kernel/apic/es7000_32.c | 2 +-
> arch/x86/kernel/apic/numaq_32.c | 2 +-
> arch/x86/kernel/apic/x2apic_cluster.c | 2 +-
> arch/x86/kernel/apic/x2apic_uv_x.c | 14 +++---
> arch/x86/kernel/cpu/amd.c | 33 +++++++-------
> arch/x86/kernel/cpu/centaur.c | 26 +++++------
> arch/x86/kernel/cpu/common.c | 64 +++++++++++++--------------
> arch/x86/kernel/cpu/cyrix.c | 40 ++++++++---------
> arch/x86/kernel/cpu/hypervisor.c | 2 +-
> arch/x86/kernel/cpu/intel.c | 30 ++++++-------
> arch/x86/kernel/cpu/intel_cacheinfo.c | 55 +++++++++++------------
> arch/x86/kernel/cpu/mcheck/mce.c | 23 +++++-----
> arch/x86/kernel/cpu/mcheck/mce_amd.c | 14 +++---
> arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 ++--
> arch/x86/kernel/cpu/perf_event.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_ibs.c | 2 +-
> arch/x86/kernel/cpu/perf_event_amd_uncore.c | 31 +++++++------
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 20 ++++-----
> arch/x86/kernel/cpu/rdrand.c | 2 +-
> arch/x86/kernel/cpu/scattered.c | 4 +-
> arch/x86/kernel/cpu/topology.c | 2 +-
> arch/x86/kernel/cpu/transmeta.c | 6 +--
> arch/x86/kernel/cpu/umc.c | 2 +-
> arch/x86/kernel/cpu/vmware.c | 2 +-
> arch/x86/kernel/cpuid.c | 7 ++-
> arch/x86/kernel/devicetree.c | 2 +-
> arch/x86/kernel/head_32.S | 1 -
> arch/x86/kernel/i387.c | 8 ++--
> arch/x86/kernel/irq_32.c | 2 +-
> arch/x86/kernel/kvm.c | 10 ++---
> arch/x86/kernel/kvmclock.c | 2 +-
> arch/x86/kernel/microcode_core.c | 2 +-
> arch/x86/kernel/microcode_core_early.c | 6 +--
> arch/x86/kernel/microcode_intel_early.c | 26 +++++------
> arch/x86/kernel/mmconf-fam10h_64.c | 12 ++---
> arch/x86/kernel/msr.c | 6 +--
> arch/x86/kernel/process.c | 2 +-
> arch/x86/kernel/setup.c | 2 +-
> arch/x86/kernel/smpboot.c | 28 ++++++------
> arch/x86/kernel/tboot.c | 6 +--
> arch/x86/kernel/tsc.c | 4 +-
> arch/x86/kernel/tsc_sync.c | 18 ++++----
> arch/x86/kernel/vsyscall_64.c | 6 +--
> arch/x86/kernel/x86_init.c | 4 +-
> arch/x86/kernel/xsave.c | 4 +-
> arch/x86/mm/mmio-mod.c | 4 +-
> arch/x86/mm/numa.c | 12 ++---
> arch/x86/mm/numa_emulation.c | 12 ++---
> arch/x86/mm/setup_nx.c | 4 +-
> arch/x86/pci/amd_bus.c | 8 ++--
> arch/x86/platform/ce4100/ce4100.c | 2 +-
> arch/x86/platform/mrst/mrst.c | 4 +-
> arch/x86/xen/enlighten.c | 6 +--
> arch/x86/xen/setup.c | 6 +--
> arch/x86/xen/smp.c | 12 ++---
> arch/x86/xen/spinlock.c | 2 +-
> arch/x86/xen/xen-ops.h | 2 +-
> arch/xtensa/kernel/time.c | 2 +-
> block/blk-iopoll.c | 6 +--
> block/blk-softirq.c | 6 +--
> drivers/acpi/acpi_processor.c | 2 +-
> drivers/acpi/processor_core.c | 8 ++--
> drivers/acpi/processor_driver.c | 8 ++--
> drivers/acpi/processor_idle.c | 6 +--
> drivers/base/cpu.c | 2 +-
> drivers/base/topology.c | 10 ++---
> drivers/clocksource/arm_arch_timer.c | 8 ++--
> drivers/clocksource/exynos_mct.c | 4 +-
> drivers/clocksource/metag_generic.c | 6 +--
> drivers/clocksource/time-armada-370-xp.c | 4 +-
> drivers/clocksource/timer-marco.c | 4 +-
> drivers/cpufreq/cpufreq.c | 4 +-
> drivers/cpufreq/cpufreq_stats.c | 4 +-
> drivers/cpufreq/dbx500-cpufreq.c | 2 +-
> drivers/cpufreq/intel_pstate.c | 4 +-
> drivers/cpufreq/longhaul.c | 6 +--
> drivers/cpufreq/longhaul.h | 26 +++++------
> drivers/cpufreq/longrun.c | 8 ++--
> drivers/cpufreq/omap-cpufreq.c | 2 +-
> drivers/cpufreq/powernow-k7.c | 8 ++--
> drivers/cpufreq/powernow-k8.c | 6 +--
> drivers/hwmon/coretemp.c | 39 ++++++++--------
> drivers/hwmon/via-cputemp.c | 8 ++--
> drivers/irqchip/irq-gic.c | 8 ++--
> drivers/oprofile/timer_int.c | 4 +-
> drivers/xen/xen-acpi-cpuhotplug.c | 2 +-
> include/asm-generic/vmlinux.lds.h | 12 -----
> include/linux/cpu.h | 2 +-
> include/linux/init.h | 19 ++++----
> include/linux/perf_event.h | 2 +-
> init/calibrate.c | 13 +++---
> kernel/cpu.c | 6 +--
> kernel/events/core.c | 4 +-
> kernel/fork.c | 2 +-
> kernel/hrtimer.c | 6 +--
> kernel/printk.c | 2 +-
> kernel/profile.c | 2 +-
> kernel/rcutorture.c | 6 +--
> kernel/rcutree.c | 6 +--
> kernel/rcutree.h | 4 +-
> kernel/rcutree_plugin.h | 6 +--
> kernel/relay.c | 2 +-
> kernel/sched/core.c | 12 ++---
> kernel/sched/fair.c | 2 +-
> kernel/smp.c | 2 +-
> kernel/smpboot.c | 2 +-
> kernel/softirq.c | 8 ++--
> kernel/time/tick-sched.c | 2 +-
> kernel/timer.c | 10 ++---
> kernel/workqueue.c | 4 +-
> lib/Kconfig.debug | 2 +-
> lib/earlycpio.c | 2 +-
> lib/percpu_counter.c | 2 +-
> mm/memcontrol.c | 2 +-
> mm/page-writeback.c | 4 +-
> mm/slab.c | 10 ++---
> mm/slub.c | 4 +-
> mm/vmstat.c | 6 +--
> net/core/flow.c | 4 +-
> net/iucv/iucv.c | 2 +-
> scripts/mod/modpost.c | 52 ++++------------------
> 307 files changed, 896 insertions(+), 1037 deletions(-)
>
^ permalink raw reply [flat|nested] 88+ messages in thread