diff options
Diffstat (limited to 'arch/mips')
39 files changed, 29 insertions, 64 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 62b9677c39a1..d46f1da18a3c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -820,10 +820,6 @@ config ARCH_HAS_ILOG2_U64 bool default n -config ARCH_SUPPORTS_OPROFILE - bool - default y if !MIPS_MT_SMTC - config GENERIC_HWEIGHT bool default y @@ -2255,16 +2251,6 @@ config HZ source "kernel/Kconfig.preempt" -config MIPS_INSANE_LARGE - bool "Support for large 64-bit configurations" - depends on CPU_R10000 && 64BIT - help - MIPS R10000 does support a 44 bit / 16TB address space as opposed to - previous 64-bit processors which only supported 40 bit / 1TB. If you - need processes of more than 1TB virtual address space, say Y here. - This will result in additional memory usage, so it is not - recommended for normal users. - config KEXEC bool "Kexec system call (EXPERIMENTAL)" depends on EXPERIMENTAL diff --git a/arch/mips/bcm47xx/gpio.c b/arch/mips/bcm47xx/gpio.c index 57b425fd4d41..5ebdf62e96bb 100644 --- a/arch/mips/bcm47xx/gpio.c +++ b/arch/mips/bcm47xx/gpio.c @@ -6,6 +6,7 @@ * Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net> */ +#include <linux/export.h> #include <linux/ssb/ssb.h> #include <linux/ssb/ssb_driver_chipcommon.h> #include <linux/ssb/ssb_driver_extif.h> diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 17c3d14d7c49..1cfdda03546a 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -26,6 +26,7 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <linux/export.h> #include <linux/types.h> #include <linux/ssb/ssb.h> #include <linux/ssb/ssb_embedded.h> diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c index 29d56afbb02d..ce6483a9302a 100644 --- a/arch/mips/cavium-octeon/csrc-octeon.c +++ b/arch/mips/cavium-octeon/csrc-octeon.c @@ -7,6 +7,7 @@ * Copyright (C) 2009, 2010 Cavium Networks, Inc. */ #include <linux/clocksource.h> +#include <linux/export.h> #include <linux/init.h> #include <linux/smp.h> diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c index 1abb66caaa1d..ea4febaa4bb1 100644 --- a/arch/mips/cavium-octeon/dma-octeon.c +++ b/arch/mips/cavium-octeon/dma-octeon.c @@ -13,6 +13,7 @@ #include <linux/dma-mapping.h> #include <linux/scatterlist.h> #include <linux/bootmem.h> +#include <linux/export.h> #include <linux/swiotlb.h> #include <linux/types.h> #include <linux/init.h> diff --git a/arch/mips/cavium-octeon/flash_setup.c b/arch/mips/cavium-octeon/flash_setup.c index 0ee02f5e51cc..975c20327bb1 100644 --- a/arch/mips/cavium-octeon/flash_setup.c +++ b/arch/mips/cavium-octeon/flash_setup.c @@ -8,6 +8,7 @@ * Copyright (C) 2007, 2008 Cavium Networks */ #include <linux/kernel.h> +#include <linux/export.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> diff --git a/arch/mips/kernel/8250-platform.c b/arch/mips/kernel/8250-platform.c index cbf3fe20ad17..5c6b2ab1f56e 100644 --- a/arch/mips/kernel/8250-platform.c +++ b/arch/mips/kernel/8250-platform.c @@ -5,7 +5,6 @@ * * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org) */ -#include <linux/module.h> #include <linux/init.h> #include <linux/serial_8250.h> diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index aa327a755982..c7d3cf1ce46e 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -16,7 +16,7 @@ #include <linux/ptrace.h> #include <linux/smp.h> #include <linux/stddef.h> -#include <linux/module.h> +#include <linux/export.h> #include <asm/bugs.h> #include <asm/cpu.h> @@ -24,6 +24,7 @@ #include <asm/mipsregs.h> #include <asm/system.h> #include <asm/watch.h> +#include <asm/elf.h> #include <asm/spram.h> #include <asm/uaccess.h> diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index be4ee7d63e04..7047bff35ea5 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c @@ -4,7 +4,7 @@ */ #include <linux/clockchips.h> #include <linux/i8253.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/smp.h> #include <linux/irq.h> diff --git a/arch/mips/kernel/init_task.c b/arch/mips/kernel/init_task.c index 6d6ca5305895..5f9a76263c9a 100644 --- a/arch/mips/kernel/init_task.c +++ b/arch/mips/kernel/init_task.c @@ -1,5 +1,5 @@ #include <linux/mm.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/sched.h> #include <linux/init_task.h> #include <linux/fs.h> diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c index 0c6afeed89d2..14ac52c5ae86 100644 --- a/arch/mips/kernel/irq-msc01.c +++ b/arch/mips/kernel/irq-msc01.c @@ -9,7 +9,6 @@ * * Copyright (C) 2004, 06 Ralf Baechle <ralf@linux-mips.org> */ -#include <linux/module.h> #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/sched.h> diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index b53970d80991..7f50318061b5 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c @@ -13,7 +13,6 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/kernel_stat.h> -#include <linux/module.h> #include <linux/proc_fs.h> #include <linux/mm.h> #include <linux/random.h> diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index 594ca69cb867..c23d11f6851d 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c @@ -6,7 +6,7 @@ #include <linux/device.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/security.h> diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 1d04807874db..57ba13edb03a 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -9,7 +9,7 @@ * Copyright (C) 1999, 2000, 01 Silicon Graphics, Inc. */ #include <linux/interrupt.h> -#include <linux/module.h> +#include <linux/export.h> #include <asm/checksum.h> #include <asm/pgtable.h> #include <asm/uaccess.h> diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c index 4b930ac4aff2..a5066b1c3de3 100644 --- a/arch/mips/kernel/module.c +++ b/arch/mips/kernel/module.c @@ -28,7 +28,6 @@ #include <linux/fs.h> #include <linux/string.h> #include <linux/kernel.h> -#include <linux/module.h> #include <linux/spinlock.h> #include <linux/jump_label.h> diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index b30cb2573aaf..c47f96e453c0 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -9,13 +9,13 @@ * Copyright (C) 2004 Thiemo Seufer */ #include <linux/errno.h> -#include <linux/module.h> #include <linux/sched.h> #include <linux/tick.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/stddef.h> #include <linux/unistd.h> +#include <linux/export.h> #include <linux/ptrace.h> #include <linux/mman.h> #include <linux/personality.h> diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 5b7eade41fa3..6b8b4208481e 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -9,7 +9,7 @@ */ #include <linux/init.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/errno.h> #include <linux/types.h> #include <linux/bootmem.h> diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c index 060563a712b6..07fc5244aed4 100644 --- a/arch/mips/kernel/reset.c +++ b/arch/mips/kernel/reset.c @@ -7,7 +7,7 @@ * Copyright (C) 2001 MIPS Technologies, Inc. */ #include <linux/kernel.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/pm.h> #include <linux/types.h> #include <linux/reboot.h> diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c index 7a80b7cda7cc..933166f44a6d 100644 --- a/arch/mips/kernel/rtlx.c +++ b/arch/mips/kernel/rtlx.c @@ -19,7 +19,6 @@ #include <linux/device.h> #include <linux/kernel.h> -#include <linux/module.h> #include <linux/fs.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8ad1d5679f14..84af26ab2212 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -12,7 +12,7 @@ */ #include <linux/init.h> #include <linux/ioport.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/screen_info.h> #include <linux/bootmem.h> #include <linux/initrd.h> diff --git a/arch/mips/kernel/spinlock_test.c b/arch/mips/kernel/spinlock_test.c index da61134dfc53..39f7ab7b0426 100644 --- a/arch/mips/kernel/spinlock_test.c +++ b/arch/mips/kernel/spinlock_test.c @@ -3,7 +3,7 @@ #include <linux/hrtimer.h> #include <linux/fs.h> #include <linux/debugfs.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/spinlock.h> diff --git a/arch/mips/kernel/stacktrace.c b/arch/mips/kernel/stacktrace.c index d52ff77baf3f..1ba775d24d38 100644 --- a/arch/mips/kernel/stacktrace.c +++ b/arch/mips/kernel/stacktrace.c @@ -5,7 +5,7 @@ */ #include <linux/sched.h> #include <linux/stacktrace.h> -#include <linux/module.h> +#include <linux/export.h> #include <asm/stacktrace.h> /* diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 1083ad4e1017..99d73b72b00b 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -21,7 +21,7 @@ #include <linux/timex.h> #include <linux/smp.h> #include <linux/spinlock.h> -#include <linux/module.h> +#include <linux/export.h> #include <asm/cpu-features.h> #include <asm/div64.h> diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index cbea618af0b4..261ccbc07740 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -16,7 +16,6 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/module.h> #include <linux/sched.h> #include <linux/smp.h> #include <linux/spinlock.h> diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index eb319b580353..aedb8941caa5 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c @@ -73,7 +73,6 @@ * Undo the partial store in this case. */ #include <linux/mm.h> -#include <linux/module.h> #include <linux/signal.h> #include <linux/smp.h> #include <linux/sched.h> diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 3efcb065f78a..bfa12a4f97b9 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -29,7 +29,6 @@ */ #include <linux/kernel.h> #include <linux/device.h> -#include <linux/module.h> #include <linux/fs.h> #include <linux/init.h> #include <asm/uaccess.h> diff --git a/arch/mips/loongson/common/platform.c b/arch/mips/loongson/common/platform.c index ed007a2e0e1f..502b059de422 100644 --- a/arch/mips/loongson/common/platform.c +++ b/arch/mips/loongson/common/platform.c @@ -9,6 +9,7 @@ */ #include <linux/err.h> +#include <linux/smp.h> #include <linux/platform_device.h> static struct platform_device loongson2_cpufreq_device = { diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index a0e726eb039a..193e9494f98e 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c @@ -9,6 +9,7 @@ */ #include <linux/init.h> #include <linux/kernel.h> +#include <linux/export.h> #include <linux/pci.h> #include <linux/smp.h> #include <asm/sn/arch.h> diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 33bba7bff258..41af7fa2887b 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c @@ -9,6 +9,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/bootmem.h> +#include <linux/export.h> #include <linux/init.h> #include <linux/types.h> #include <linux/pci.h> diff --git a/arch/mips/powertv/Kconfig b/arch/mips/powertv/Kconfig index ff0e7e3e6954..1a1b03ea6398 100644 --- a/arch/mips/powertv/Kconfig +++ b/arch/mips/powertv/Kconfig @@ -1,5 +1,3 @@ -source "arch/mips/powertv/asic/Kconfig" - config BOOTLOADER_DRIVER bool "PowerTV Bootloader Driver Support" default n diff --git a/arch/mips/powertv/asic/Kconfig b/arch/mips/powertv/asic/Kconfig deleted file mode 100644 index 2016bfe94d66..000000000000 --- a/arch/mips/powertv/asic/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -config MIN_RUNTIME_RESOURCES - bool "Support for minimum runtime resources" - default n - depends on POWERTV - help - Enables support for minimizing the number of (SA asic) runtime - resources that are preallocated by the kernel. - -config MIN_RUNTIME_DOCSIS - bool "Support for minimum DOCSIS resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated DOCSIS resource. - -config MIN_RUNTIME_PMEM - bool "Support for minimum PMEM resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated Memory resource. - -config MIN_RUNTIME_TFTP - bool "Support for minimum TFTP resource" - default y - depends on MIN_RUNTIME_RESOURCES - help - Enables support for the preallocated TFTP resource. diff --git a/arch/mips/powertv/pci/fixup-powertv.c b/arch/mips/powertv/pci/fixup-powertv.c index 726bc2e824b3..d7ecbae64a6e 100644 --- a/arch/mips/powertv/pci/fixup-powertv.c +++ b/arch/mips/powertv/pci/fixup-powertv.c @@ -1,4 +1,5 @@ #include <linux/init.h> +#include <linux/export.h> #include <linux/pci.h> #include <asm/mach-powertv/interrupts.h> #include "powertv-pci.h" diff --git a/arch/mips/powertv/powertv-usb.c b/arch/mips/powertv/powertv-usb.c index 6ac85cf7aa20..b0e2afa89395 100644 --- a/arch/mips/powertv/powertv-usb.c +++ b/arch/mips/powertv/powertv-usb.c @@ -29,6 +29,7 @@ */ #include <linux/kernel.h> +#include <linux/export.h> #include <linux/ioport.h> #include <linux/platform_device.h> #include <asm/mach-powertv/asic.h> diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c index 6c47dfeb7be3..6ec41df3cb99 100644 --- a/arch/mips/rb532/gpio.c +++ b/arch/mips/rb532/gpio.c @@ -29,6 +29,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/types.h> +#include <linux/export.h> #include <linux/spinlock.h> #include <linux/platform_device.h> #include <linux/gpio.h> diff --git a/arch/mips/rb532/setup.c b/arch/mips/rb532/setup.c index 50f530f5b602..d0c64e71d532 100644 --- a/arch/mips/rb532/setup.c +++ b/arch/mips/rb532/setup.c @@ -3,6 +3,7 @@ */ #include <linux/init.h> +#include <linux/export.h> #include <asm/bootinfo.h> #include <asm/reboot.h> diff --git a/arch/mips/txx9/generic/spi_eeprom.c b/arch/mips/txx9/generic/spi_eeprom.c index 103abc13d623..3dbad99d5611 100644 --- a/arch/mips/txx9/generic/spi_eeprom.c +++ b/arch/mips/txx9/generic/spi_eeprom.c @@ -11,6 +11,7 @@ */ #include <linux/init.h> #include <linux/slab.h> +#include <linux/export.h> #include <linux/device.h> #include <linux/spi/spi.h> #include <linux/spi/eeprom.h> diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c index 7dc0fafbec80..2ad8973ba13d 100644 --- a/arch/mips/txx9/rbtx4939/setup.c +++ b/arch/mips/txx9/rbtx4939/setup.c @@ -13,6 +13,7 @@ #include <linux/kernel.h> #include <linux/types.h> #include <linux/slab.h> +#include <linux/export.h> #include <linux/platform_device.h> #include <linux/leds.h> #include <linux/interrupt.h> diff --git a/arch/mips/vr41xx/common/giu.c b/arch/mips/vr41xx/common/giu.c index 22cc6f2100a1..b32b3bc60441 100644 --- a/arch/mips/vr41xx/common/giu.c +++ b/arch/mips/vr41xx/common/giu.c @@ -19,6 +19,7 @@ */ #include <linux/errno.h> #include <linux/init.h> +#include <linux/smp.h> #include <linux/ioport.h> #include <linux/platform_device.h> diff --git a/arch/mips/vr41xx/common/rtc.c b/arch/mips/vr41xx/common/rtc.c index ebc5dcf0ed8e..76e3e8af7c96 100644 --- a/arch/mips/vr41xx/common/rtc.c +++ b/arch/mips/vr41xx/common/rtc.c @@ -19,6 +19,7 @@ */ #include <linux/errno.h> #include <linux/init.h> +#include <linux/smp.h> #include <linux/ioport.h> #include <linux/platform_device.h> |