aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/arm/tcm.txt10
-rw-r--r--MAINTAINERS12
-rw-r--r--arch/arm/common/sa1111.c25
-rw-r--r--arch/arm/configs/h3600_defconfig1
-rw-r--r--arch/arm/configs/iop33x_defconfig554
-rw-r--r--arch/arm/include/asm/glue.h26
-rw-r--r--arch/arm/include/asm/hardware/iop3xx.h1
-rw-r--r--arch/arm/include/asm/smp_plat.h16
-rw-r--r--arch/arm/include/asm/unistd.h1
-rw-r--r--arch/arm/kernel/entry-armv.S18
-rw-r--r--arch/arm/kernel/entry-common.S11
-rw-r--r--arch/arm/kernel/head-common.S4
-rw-r--r--arch/arm/kernel/smp.c13
-rw-r--r--arch/arm/kernel/smp_twd.c4
-rw-r--r--arch/arm/kernel/traps.c5
-rw-r--r--arch/arm/mach-bcmring/core.c2
-rw-r--r--arch/arm/mach-davinci/board-dm365-evm.c1
-rw-r--r--arch/arm/mach-integrator/pci_v3.c2
-rw-r--r--arch/arm/mach-iop32x/include/mach/iop32x.h2
-rw-r--r--arch/arm/mach-iop33x/include/mach/iop33x.h2
-rw-r--r--arch/arm/mach-sa1100/Kconfig5
-rw-r--r--arch/arm/mach-sa1100/time.c2
-rw-r--r--arch/arm/mach-u300/gpio.c10
-rw-r--r--arch/arm/mach-u300/include/mach/gpio.h1
-rw-r--r--arch/arm/mm/Kconfig57
-rw-r--r--arch/arm/mm/Makefile4
-rw-r--r--arch/arm/mm/fault.c53
-rw-r--r--arch/arm/mm/mmap.c2
-rw-r--r--arch/arm/mm/mmu.c39
-rw-r--r--arch/arm/mm/pabort-legacy.S19
-rw-r--r--arch/arm/mm/pabort-v6.S19
-rw-r--r--arch/arm/mm/pabort-v7.S20
-rw-r--r--arch/arm/mm/proc-arm1020.S2
-rw-r--r--arch/arm/mm/proc-arm1020e.S2
-rw-r--r--arch/arm/mm/proc-arm1022.S2
-rw-r--r--arch/arm/mm/proc-arm1026.S2
-rw-r--r--arch/arm/mm/proc-arm6_7.S4
-rw-r--r--arch/arm/mm/proc-arm720.S2
-rw-r--r--arch/arm/mm/proc-arm740.S2
-rw-r--r--arch/arm/mm/proc-arm7tdmi.S2
-rw-r--r--arch/arm/mm/proc-arm920.S2
-rw-r--r--arch/arm/mm/proc-arm922.S2
-rw-r--r--arch/arm/mm/proc-arm925.S2
-rw-r--r--arch/arm/mm/proc-arm926.S2
-rw-r--r--arch/arm/mm/proc-arm940.S2
-rw-r--r--arch/arm/mm/proc-arm946.S2
-rw-r--r--arch/arm/mm/proc-arm9tdmi.S2
-rw-r--r--arch/arm/mm/proc-fa526.S2
-rw-r--r--arch/arm/mm/proc-feroceon.S2
-rw-r--r--arch/arm/mm/proc-mohawk.S2
-rw-r--r--arch/arm/mm/proc-sa110.S2
-rw-r--r--arch/arm/mm/proc-sa1100.S2
-rw-r--r--arch/arm/mm/proc-v6.S2
-rw-r--r--arch/arm/mm/proc-v7.S2
-rw-r--r--arch/arm/mm/proc-xsc3.S2
-rw-r--r--arch/arm/mm/proc-xscale.S2
-rw-r--r--arch/arm/plat-iop/pci.c3
-rw-r--r--arch/arm/plat-iop/time.c2
-rw-r--r--drivers/mmc/host/mmci.c2
-rw-r--r--drivers/pcmcia/sa1100_assabet.c2
-rw-r--r--drivers/pcmcia/sa1100_neponset.c2
-rw-r--r--drivers/serial/sa1100.c2
62 files changed, 736 insertions, 268 deletions
diff --git a/Documentation/arm/tcm.txt b/Documentation/arm/tcm.txt
index 074f4be6667f..77fd9376e6d7 100644
--- a/Documentation/arm/tcm.txt
+++ b/Documentation/arm/tcm.txt
@@ -29,11 +29,13 @@ TCM location and size. Notice that this is not a MMU table: you
29actually move the physical location of the TCM around. At the 29actually move the physical location of the TCM around. At the
30place you put it, it will mask any underlying RAM from the 30place you put it, it will mask any underlying RAM from the
31CPU so it is usually wise not to overlap any physical RAM with 31CPU so it is usually wise not to overlap any physical RAM with
32the TCM. The TCM memory exists totally outside the MMU and will 32the TCM.
33override any MMU mappings.
34 33
35Code executing inside the ITCM does not "see" any MMU mappings 34The TCM memory can then be remapped to another address again using
36and e.g. register accesses must be made to physical addresses. 35the MMU, but notice that the TCM if often used in situations where
36the MMU is turned off. To avoid confusion the current Linux
37implementation will map the TCM 1 to 1 from physical to virtual
38memory in the location specified by the machine.
37 39
38TCM is used for a few things: 40TCM is used for a few things:
39 41
diff --git a/MAINTAINERS b/MAINTAINERS
index f8f9c4f5f7d6..737a9b2c532d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -646,24 +646,24 @@ ARM/INTEL IOP32X ARM ARCHITECTURE
646M: Lennert Buytenhek <kernel@wantstofly.org> 646M: Lennert Buytenhek <kernel@wantstofly.org>
647M: Dan Williams <dan.j.williams@intel.com> 647M: Dan Williams <dan.j.williams@intel.com>
648L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 648L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
649S: Supported 649S: Maintained
650 650
651ARM/INTEL IOP33X ARM ARCHITECTURE 651ARM/INTEL IOP33X ARM ARCHITECTURE
652M: Dan Williams <dan.j.williams@intel.com> 652M: Dan Williams <dan.j.williams@intel.com>
653L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 653L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
654S: Supported 654S: Maintained
655 655
656ARM/INTEL IOP13XX ARM ARCHITECTURE 656ARM/INTEL IOP13XX ARM ARCHITECTURE
657M: Lennert Buytenhek <kernel@wantstofly.org> 657M: Lennert Buytenhek <kernel@wantstofly.org>
658M: Dan Williams <dan.j.williams@intel.com> 658M: Dan Williams <dan.j.williams@intel.com>
659L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 659L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
660S: Supported 660S: Maintained
661 661
662ARM/INTEL IQ81342EX MACHINE SUPPORT 662ARM/INTEL IQ81342EX MACHINE SUPPORT
663M: Lennert Buytenhek <kernel@wantstofly.org> 663M: Lennert Buytenhek <kernel@wantstofly.org>
664M: Dan Williams <dan.j.williams@intel.com> 664M: Dan Williams <dan.j.williams@intel.com>
665L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 665L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
666S: Supported 666S: Maintained
667 667
668ARM/INTEL IXP2000 ARM ARCHITECTURE 668ARM/INTEL IXP2000 ARM ARCHITECTURE
669M: Lennert Buytenhek <kernel@wantstofly.org> 669M: Lennert Buytenhek <kernel@wantstofly.org>
@@ -691,7 +691,7 @@ ARM/INTEL XSC3 (MANZANO) ARM CORE
691M: Lennert Buytenhek <kernel@wantstofly.org> 691M: Lennert Buytenhek <kernel@wantstofly.org>
692M: Dan Williams <dan.j.williams@intel.com> 692M: Dan Williams <dan.j.williams@intel.com>
693L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 693L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
694S: Supported 694S: Maintained
695 695
696ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT 696ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
697M: Lennert Buytenhek <kernel@wantstofly.org> 697M: Lennert Buytenhek <kernel@wantstofly.org>
@@ -2695,7 +2695,7 @@ F: include/linux/intel-iommu.h
2695 2695
2696INTEL IOP-ADMA DMA DRIVER 2696INTEL IOP-ADMA DMA DRIVER
2697M: Dan Williams <dan.j.williams@intel.com> 2697M: Dan Williams <dan.j.williams@intel.com>
2698S: Supported 2698S: Maintained
2699F: drivers/dma/iop-adma.c 2699F: drivers/dma/iop-adma.c
2700 2700
2701INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT 2701INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index ef12794c3c68..8ba7044c554d 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -1032,6 +1032,7 @@ unsigned int sa1111_pll_clock(struct sa1111_dev *sadev)
1032 1032
1033 return __sa1111_pll_clock(sachip); 1033 return __sa1111_pll_clock(sachip);
1034} 1034}
1035EXPORT_SYMBOL(sa1111_pll_clock);
1035 1036
1036/** 1037/**
1037 * sa1111_select_audio_mode - select I2S or AC link mode 1038 * sa1111_select_audio_mode - select I2S or AC link mode
@@ -1059,6 +1060,7 @@ void sa1111_select_audio_mode(struct sa1111_dev *sadev, int mode)
1059 1060
1060 spin_unlock_irqrestore(&sachip->lock, flags); 1061 spin_unlock_irqrestore(&sachip->lock, flags);
1061} 1062}
1063EXPORT_SYMBOL(sa1111_select_audio_mode);
1062 1064
1063/** 1065/**
1064 * sa1111_set_audio_rate - set the audio sample rate 1066 * sa1111_set_audio_rate - set the audio sample rate
@@ -1083,6 +1085,7 @@ int sa1111_set_audio_rate(struct sa1111_dev *sadev, int rate)
1083 1085
1084 return 0; 1086 return 0;
1085} 1087}
1088EXPORT_SYMBOL(sa1111_set_audio_rate);
1086 1089
1087/** 1090/**
1088 * sa1111_get_audio_rate - get the audio sample rate 1091 * sa1111_get_audio_rate - get the audio sample rate
@@ -1100,6 +1103,7 @@ int sa1111_get_audio_rate(struct sa1111_dev *sadev)
1100 1103
1101 return __sa1111_pll_clock(sachip) / (256 * div); 1104 return __sa1111_pll_clock(sachip) / (256 * div);
1102} 1105}
1106EXPORT_SYMBOL(sa1111_get_audio_rate);
1103 1107
1104void sa1111_set_io_dir(struct sa1111_dev *sadev, 1108void sa1111_set_io_dir(struct sa1111_dev *sadev,
1105 unsigned int bits, unsigned int dir, 1109 unsigned int bits, unsigned int dir,
@@ -1128,6 +1132,7 @@ void sa1111_set_io_dir(struct sa1111_dev *sadev,
1128 MODIFY_BITS(gpio + SA1111_GPIO_PCSDR, (bits >> 16) & 255, sleep_dir >> 16); 1132 MODIFY_BITS(gpio + SA1111_GPIO_PCSDR, (bits >> 16) & 255, sleep_dir >> 16);
1129 spin_unlock_irqrestore(&sachip->lock, flags); 1133 spin_unlock_irqrestore(&sachip->lock, flags);
1130} 1134}
1135EXPORT_SYMBOL(sa1111_set_io_dir);
1131 1136
1132void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v) 1137void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)
1133{ 1138{
@@ -1142,6 +1147,7 @@ void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)
1142 MODIFY_BITS(gpio + SA1111_GPIO_PCDWR, (bits >> 16) & 255, v >> 16); 1147 MODIFY_BITS(gpio + SA1111_GPIO_PCDWR, (bits >> 16) & 255, v >> 16);
1143 spin_unlock_irqrestore(&sachip->lock, flags); 1148 spin_unlock_irqrestore(&sachip->lock, flags);
1144} 1149}
1150EXPORT_SYMBOL(sa1111_set_io);
1145 1151
1146void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v) 1152void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)
1147{ 1153{
@@ -1156,6 +1162,7 @@ void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned i
1156 MODIFY_BITS(gpio + SA1111_GPIO_PCSSR, (bits >> 16) & 255, v >> 16); 1162 MODIFY_BITS(gpio + SA1111_GPIO_PCSSR, (bits >> 16) & 255, v >> 16);
1157 spin_unlock_irqrestore(&sachip->lock, flags); 1163 spin_unlock_irqrestore(&sachip->lock, flags);
1158} 1164}
1165EXPORT_SYMBOL(sa1111_set_sleep_io);
1159 1166
1160/* 1167/*
1161 * Individual device operations. 1168 * Individual device operations.
@@ -1176,6 +1183,7 @@ void sa1111_enable_device(struct sa1111_dev *sadev)
1176 sa1111_writel(val | sadev->skpcr_mask, sachip->base + SA1111_SKPCR); 1183 sa1111_writel(val | sadev->skpcr_mask, sachip->base + SA1111_SKPCR);
1177 spin_unlock_irqrestore(&sachip->lock, flags); 1184 spin_unlock_irqrestore(&sachip->lock, flags);
1178} 1185}
1186EXPORT_SYMBOL(sa1111_enable_device);
1179 1187
1180/** 1188/**
1181 * sa1111_disable_device - disable an on-chip SA1111 function block 1189 * sa1111_disable_device - disable an on-chip SA1111 function block
@@ -1192,6 +1200,7 @@ void sa1111_disable_device(struct sa1111_dev *sadev)
1192 sa1111_writel(val & ~sadev->skpcr_mask, sachip->base + SA1111_SKPCR); 1200 sa1111_writel(val & ~sadev->skpcr_mask, sachip->base + SA1111_SKPCR);
1193 spin_unlock_irqrestore(&sachip->lock, flags); 1201 spin_unlock_irqrestore(&sachip->lock, flags);
1194} 1202}
1203EXPORT_SYMBOL(sa1111_disable_device);
1195 1204
1196/* 1205/*
1197 * SA1111 "Register Access Bus." 1206 * SA1111 "Register Access Bus."
@@ -1259,17 +1268,20 @@ struct bus_type sa1111_bus_type = {
1259 .suspend = sa1111_bus_suspend, 1268 .suspend = sa1111_bus_suspend,
1260 .resume = sa1111_bus_resume, 1269 .resume = sa1111_bus_resume,
1261}; 1270};
1271EXPORT_SYMBOL(sa1111_bus_type);
1262 1272
1263int sa1111_driver_register(struct sa1111_driver *driver) 1273int sa1111_driver_register(struct sa1111_driver *driver)
1264{ 1274{
1265 driver->drv.bus = &sa1111_bus_type; 1275 driver->drv.bus = &sa1111_bus_type;
1266 return driver_register(&driver->drv); 1276 return driver_register(&driver->drv);
1267} 1277}
1278EXPORT_SYMBOL(sa1111_driver_register);
1268 1279
1269void sa1111_driver_unregister(struct sa1111_driver *driver) 1280void sa1111_driver_unregister(struct sa1111_driver *driver)
1270{ 1281{
1271 driver_unregister(&driver->drv); 1282 driver_unregister(&driver->drv);
1272} 1283}
1284EXPORT_SYMBOL(sa1111_driver_unregister);
1273 1285
1274static int __init sa1111_init(void) 1286static int __init sa1111_init(void)
1275{ 1287{
@@ -1290,16 +1302,3 @@ module_exit(sa1111_exit);
1290 1302
1291MODULE_DESCRIPTION("Intel Corporation SA1111 core driver"); 1303MODULE_DESCRIPTION("Intel Corporation SA1111 core driver");
1292MODULE_LICENSE("GPL"); 1304MODULE_LICENSE("GPL");
1293
1294EXPORT_SYMBOL(sa1111_select_audio_mode);
1295EXPORT_SYMBOL(sa1111_set_audio_rate);
1296EXPORT_SYMBOL(sa1111_get_audio_rate);
1297EXPORT_SYMBOL(sa1111_set_io_dir);
1298EXPORT_SYMBOL(sa1111_set_io);
1299EXPORT_SYMBOL(sa1111_set_sleep_io);
1300EXPORT_SYMBOL(sa1111_enable_device);
1301EXPORT_SYMBOL(sa1111_disable_device);
1302EXPORT_SYMBOL(sa1111_pll_clock);
1303EXPORT_SYMBOL(sa1111_bus_type);
1304EXPORT_SYMBOL(sa1111_driver_register);
1305EXPORT_SYMBOL(sa1111_driver_unregister);
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig
index 1502957db2c3..f6aed7747d4d 100644
--- a/arch/arm/configs/h3600_defconfig
+++ b/arch/arm/configs/h3600_defconfig
@@ -90,7 +90,6 @@ CONFIG_ARCH_SA1100=y
90# CONFIG_SA1100_COLLIE is not set 90# CONFIG_SA1100_COLLIE is not set
91# CONFIG_SA1100_H3100 is not set 91# CONFIG_SA1100_H3100 is not set
92CONFIG_SA1100_H3600=y 92CONFIG_SA1100_H3600=y
93CONFIG_SA1100_H3XXX=y
94# CONFIG_SA1100_BADGE4 is not set 93# CONFIG_SA1100_BADGE4 is not set
95# CONFIG_SA1100_JORNADA720 is not set 94# CONFIG_SA1100_JORNADA720 is not set
96# CONFIG_SA1100_HACKKIT is not set 95# CONFIG_SA1100_HACKKIT is not set
diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig
index eec488298267..ed2d59d01829 100644
--- a/arch/arm/configs/iop33x_defconfig
+++ b/arch/arm/configs/iop33x_defconfig
@@ -1,29 +1,26 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.24-rc5 3# Linux kernel version: 2.6.31-rc6
4# Wed Dec 12 16:11:27 2007 4# Tue Aug 18 13:41:41 2009
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
8# CONFIG_GENERIC_GPIO is not set 8CONFIG_GENERIC_GPIO=y
9# CONFIG_GENERIC_TIME is not set
10# CONFIG_GENERIC_CLOCKEVENTS is not set
11CONFIG_MMU=y 9CONFIG_MMU=y
12# CONFIG_NO_IOPORT is not set
13CONFIG_GENERIC_HARDIRQS=y 10CONFIG_GENERIC_HARDIRQS=y
14CONFIG_STACKTRACE_SUPPORT=y 11CONFIG_STACKTRACE_SUPPORT=y
12CONFIG_HAVE_LATENCYTOP_SUPPORT=y
15CONFIG_LOCKDEP_SUPPORT=y 13CONFIG_LOCKDEP_SUPPORT=y
16CONFIG_TRACE_IRQFLAGS_SUPPORT=y 14CONFIG_TRACE_IRQFLAGS_SUPPORT=y
17CONFIG_HARDIRQS_SW_RESEND=y 15CONFIG_HARDIRQS_SW_RESEND=y
18CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
19CONFIG_RWSEM_GENERIC_SPINLOCK=y 17CONFIG_RWSEM_GENERIC_SPINLOCK=y
20# CONFIG_ARCH_HAS_ILOG2_U32 is not set
21# CONFIG_ARCH_HAS_ILOG2_U64 is not set
22CONFIG_GENERIC_HWEIGHT=y 18CONFIG_GENERIC_HWEIGHT=y
23CONFIG_GENERIC_CALIBRATE_DELAY=y 19CONFIG_GENERIC_CALIBRATE_DELAY=y
24CONFIG_ZONE_DMA=y 20CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
25CONFIG_VECTORS_BASE=0xffff0000 21CONFIG_VECTORS_BASE=0xffff0000
26CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 22CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
23CONFIG_CONSTRUCTORS=y
27 24
28# 25#
29# General setup 26# General setup
@@ -40,21 +37,39 @@ CONFIG_SYSVIPC_SYSCTL=y
40CONFIG_BSD_PROCESS_ACCT=y 37CONFIG_BSD_PROCESS_ACCT=y
41# CONFIG_BSD_PROCESS_ACCT_V3 is not set 38# CONFIG_BSD_PROCESS_ACCT_V3 is not set
42# CONFIG_TASKSTATS is not set 39# CONFIG_TASKSTATS is not set
43# CONFIG_USER_NS is not set
44# CONFIG_PID_NS is not set
45# CONFIG_AUDIT is not set 40# CONFIG_AUDIT is not set
41
42#
43# RCU Subsystem
44#
45# CONFIG_CLASSIC_RCU is not set
46CONFIG_TREE_RCU=y
47# CONFIG_PREEMPT_RCU is not set
48# CONFIG_RCU_TRACE is not set
49CONFIG_RCU_FANOUT=32
50# CONFIG_RCU_FANOUT_EXACT is not set
51# CONFIG_TREE_RCU_TRACE is not set
52# CONFIG_PREEMPT_RCU_TRACE is not set
46# CONFIG_IKCONFIG is not set 53# CONFIG_IKCONFIG is not set
47CONFIG_LOG_BUF_SHIFT=14 54CONFIG_LOG_BUF_SHIFT=14
55# CONFIG_GROUP_SCHED is not set
48# CONFIG_CGROUPS is not set 56# CONFIG_CGROUPS is not set
49CONFIG_FAIR_GROUP_SCHED=y 57# CONFIG_SYSFS_DEPRECATED_V2 is not set
50CONFIG_FAIR_USER_SCHED=y
51# CONFIG_FAIR_CGROUP_SCHED is not set
52CONFIG_SYSFS_DEPRECATED=y
53# CONFIG_RELAY is not set 58# CONFIG_RELAY is not set
59CONFIG_NAMESPACES=y
60# CONFIG_UTS_NS is not set
61# CONFIG_IPC_NS is not set
62# CONFIG_USER_NS is not set
63# CONFIG_PID_NS is not set
64# CONFIG_NET_NS is not set
54CONFIG_BLK_DEV_INITRD=y 65CONFIG_BLK_DEV_INITRD=y
55CONFIG_INITRAMFS_SOURCE="" 66CONFIG_INITRAMFS_SOURCE=""
67CONFIG_RD_GZIP=y
68CONFIG_RD_BZIP2=y
69CONFIG_RD_LZMA=y
56CONFIG_CC_OPTIMIZE_FOR_SIZE=y 70CONFIG_CC_OPTIMIZE_FOR_SIZE=y
57CONFIG_SYSCTL=y 71CONFIG_SYSCTL=y
72CONFIG_ANON_INODES=y
58# CONFIG_EMBEDDED is not set 73# CONFIG_EMBEDDED is not set
59CONFIG_UID16=y 74CONFIG_UID16=y
60CONFIG_SYSCTL_SYSCALL=y 75CONFIG_SYSCTL_SYSCALL=y
@@ -67,29 +82,48 @@ CONFIG_BUG=y
67CONFIG_ELF_CORE=y 82CONFIG_ELF_CORE=y
68CONFIG_BASE_FULL=y 83CONFIG_BASE_FULL=y
69CONFIG_FUTEX=y 84CONFIG_FUTEX=y
70CONFIG_ANON_INODES=y
71CONFIG_EPOLL=y 85CONFIG_EPOLL=y
72CONFIG_SIGNALFD=y 86CONFIG_SIGNALFD=y
87CONFIG_TIMERFD=y
73CONFIG_EVENTFD=y 88CONFIG_EVENTFD=y
74CONFIG_SHMEM=y 89CONFIG_SHMEM=y
90CONFIG_AIO=y
91
92#
93# Performance Counters
94#
75CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_PCI_QUIRKS=y
97# CONFIG_STRIP_ASM_SYMS is not set
98CONFIG_COMPAT_BRK=y
76CONFIG_SLAB=y 99CONFIG_SLAB=y
77# CONFIG_SLUB is not set 100# CONFIG_SLUB is not set
78# CONFIG_SLOB is not set 101# CONFIG_SLOB is not set
102# CONFIG_PROFILING is not set
103# CONFIG_MARKERS is not set
104CONFIG_HAVE_OPROFILE=y
105# CONFIG_KPROBES is not set
106CONFIG_HAVE_KPROBES=y
107CONFIG_HAVE_KRETPROBES=y
108
109#
110# GCOV-based kernel profiling
111#
112# CONFIG_SLOW_WORK is not set
113CONFIG_HAVE_GENERIC_DMA_COHERENT=y
114CONFIG_SLABINFO=y
79CONFIG_RT_MUTEXES=y 115CONFIG_RT_MUTEXES=y
80# CONFIG_TINY_SHMEM is not set
81CONFIG_BASE_SMALL=0 116CONFIG_BASE_SMALL=0
82CONFIG_MODULES=y 117CONFIG_MODULES=y
118# CONFIG_MODULE_FORCE_LOAD is not set
83CONFIG_MODULE_UNLOAD=y 119CONFIG_MODULE_UNLOAD=y
84# CONFIG_MODULE_FORCE_UNLOAD is not set 120# CONFIG_MODULE_FORCE_UNLOAD is not set
85# CONFIG_MODVERSIONS is not set 121# CONFIG_MODVERSIONS is not set
86# CONFIG_MODULE_SRCVERSION_ALL is not set 122# CONFIG_MODULE_SRCVERSION_ALL is not set
87CONFIG_KMOD=y
88CONFIG_BLOCK=y 123CONFIG_BLOCK=y
89# CONFIG_LBD is not set 124CONFIG_LBDAF=y
90# CONFIG_BLK_DEV_IO_TRACE is not set
91# CONFIG_LSF is not set
92# CONFIG_BLK_DEV_BSG is not set 125# CONFIG_BLK_DEV_BSG is not set
126# CONFIG_BLK_DEV_INTEGRITY is not set
93 127
94# 128#
95# IO Schedulers 129# IO Schedulers
@@ -103,6 +137,7 @@ CONFIG_IOSCHED_CFQ=y
103CONFIG_DEFAULT_CFQ=y 137CONFIG_DEFAULT_CFQ=y
104# CONFIG_DEFAULT_NOOP is not set 138# CONFIG_DEFAULT_NOOP is not set
105CONFIG_DEFAULT_IOSCHED="cfq" 139CONFIG_DEFAULT_IOSCHED="cfq"
140# CONFIG_FREEZER is not set
106 141
107# 142#
108# System Type 143# System Type
@@ -112,15 +147,15 @@ CONFIG_DEFAULT_IOSCHED="cfq"
112# CONFIG_ARCH_REALVIEW is not set 147# CONFIG_ARCH_REALVIEW is not set
113# CONFIG_ARCH_VERSATILE is not set 148# CONFIG_ARCH_VERSATILE is not set
114# CONFIG_ARCH_AT91 is not set 149# CONFIG_ARCH_AT91 is not set
115# CONFIG_ARCH_CLPS7500 is not set
116# CONFIG_ARCH_CLPS711X is not set 150# CONFIG_ARCH_CLPS711X is not set
117# CONFIG_ARCH_CO285 is not set 151# CONFIG_ARCH_GEMINI is not set
118# CONFIG_ARCH_EBSA110 is not set 152# CONFIG_ARCH_EBSA110 is not set
119# CONFIG_ARCH_EP93XX is not set 153# CONFIG_ARCH_EP93XX is not set
120# CONFIG_ARCH_FOOTBRIDGE is not set 154# CONFIG_ARCH_FOOTBRIDGE is not set
155# CONFIG_ARCH_MXC is not set
156# CONFIG_ARCH_STMP3XXX is not set
121# CONFIG_ARCH_NETX is not set 157# CONFIG_ARCH_NETX is not set
122# CONFIG_ARCH_H720X is not set 158# CONFIG_ARCH_H720X is not set
123# CONFIG_ARCH_IMX is not set
124# CONFIG_ARCH_IOP13XX is not set 159# CONFIG_ARCH_IOP13XX is not set
125# CONFIG_ARCH_IOP32X is not set 160# CONFIG_ARCH_IOP32X is not set
126CONFIG_ARCH_IOP33X=y 161CONFIG_ARCH_IOP33X=y
@@ -128,19 +163,26 @@ CONFIG_ARCH_IOP33X=y
128# CONFIG_ARCH_IXP2000 is not set 163# CONFIG_ARCH_IXP2000 is not set
129# CONFIG_ARCH_IXP4XX is not set 164# CONFIG_ARCH_IXP4XX is not set
130# CONFIG_ARCH_L7200 is not set 165# CONFIG_ARCH_L7200 is not set
166# CONFIG_ARCH_KIRKWOOD is not set
167# CONFIG_ARCH_LOKI is not set
168# CONFIG_ARCH_MV78XX0 is not set
169# CONFIG_ARCH_ORION5X is not set
170# CONFIG_ARCH_MMP is not set
131# CONFIG_ARCH_KS8695 is not set 171# CONFIG_ARCH_KS8695 is not set
132# CONFIG_ARCH_NS9XXX is not set 172# CONFIG_ARCH_NS9XXX is not set
133# CONFIG_ARCH_MXC is not set 173# CONFIG_ARCH_W90X900 is not set
134# CONFIG_ARCH_PNX4008 is not set 174# CONFIG_ARCH_PNX4008 is not set
135# CONFIG_ARCH_PXA is not set 175# CONFIG_ARCH_PXA is not set
176# CONFIG_ARCH_MSM is not set
136# CONFIG_ARCH_RPC is not set 177# CONFIG_ARCH_RPC is not set
137# CONFIG_ARCH_SA1100 is not set 178# CONFIG_ARCH_SA1100 is not set
138# CONFIG_ARCH_S3C2410 is not set 179# CONFIG_ARCH_S3C2410 is not set
180# CONFIG_ARCH_S3C64XX is not set
139# CONFIG_ARCH_SHARK is not set 181# CONFIG_ARCH_SHARK is not set
140# CONFIG_ARCH_LH7A40X is not set 182# CONFIG_ARCH_LH7A40X is not set
183# CONFIG_ARCH_U300 is not set
141# CONFIG_ARCH_DAVINCI is not set 184# CONFIG_ARCH_DAVINCI is not set
142# CONFIG_ARCH_OMAP is not set 185# CONFIG_ARCH_OMAP is not set
143CONFIG_IOP3XX_ATU=y
144 186
145# 187#
146# IOP33x Implementation Options 188# IOP33x Implementation Options
@@ -151,14 +193,6 @@ CONFIG_IOP3XX_ATU=y
151# 193#
152CONFIG_ARCH_IQ80331=y 194CONFIG_ARCH_IQ80331=y
153CONFIG_MACH_IQ80332=y 195CONFIG_MACH_IQ80332=y
154
155#
156# Boot options
157#
158
159#
160# Power management
161#
162CONFIG_PLAT_IOP=y 196CONFIG_PLAT_IOP=y
163 197
164# 198#
@@ -168,6 +202,7 @@ CONFIG_CPU_32=y
168CONFIG_CPU_XSCALE=y 202CONFIG_CPU_XSCALE=y
169CONFIG_CPU_32v5=y 203CONFIG_CPU_32v5=y
170CONFIG_CPU_ABRT_EV5T=y 204CONFIG_CPU_ABRT_EV5T=y
205CONFIG_CPU_PABRT_NOIFAR=y
171CONFIG_CPU_CACHE_VIVT=y 206CONFIG_CPU_CACHE_VIVT=y
172CONFIG_CPU_TLB_V4WBI=y 207CONFIG_CPU_TLB_V4WBI=y
173CONFIG_CPU_CP15=y 208CONFIG_CPU_CP15=y
@@ -178,7 +213,6 @@ CONFIG_CPU_CP15_MMU=y
178# 213#
179# CONFIG_ARM_THUMB is not set 214# CONFIG_ARM_THUMB is not set
180# CONFIG_CPU_DCACHE_DISABLE is not set 215# CONFIG_CPU_DCACHE_DISABLE is not set
181# CONFIG_OUTER_CACHE is not set
182# CONFIG_IWMMXT is not set 216# CONFIG_IWMMXT is not set
183CONFIG_XSCALE_PMU=y 217CONFIG_XSCALE_PMU=y
184 218
@@ -190,41 +224,55 @@ CONFIG_PCI_SYSCALL=y
190# CONFIG_ARCH_SUPPORTS_MSI is not set 224# CONFIG_ARCH_SUPPORTS_MSI is not set
191CONFIG_PCI_LEGACY=y 225CONFIG_PCI_LEGACY=y
192# CONFIG_PCI_DEBUG is not set 226# CONFIG_PCI_DEBUG is not set
227# CONFIG_PCI_STUB is not set
228# CONFIG_PCI_IOV is not set
193# CONFIG_PCCARD is not set 229# CONFIG_PCCARD is not set
194 230
195# 231#
196# Kernel Features 232# Kernel Features
197# 233#
198# CONFIG_TICK_ONESHOT is not set 234CONFIG_VMSPLIT_3G=y
235# CONFIG_VMSPLIT_2G is not set
236# CONFIG_VMSPLIT_1G is not set
237CONFIG_PAGE_OFFSET=0xC0000000
199# CONFIG_PREEMPT is not set 238# CONFIG_PREEMPT is not set
200CONFIG_HZ=100 239CONFIG_HZ=100
201# CONFIG_AEABI is not set 240# CONFIG_AEABI is not set
202# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 241# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
242# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
243# CONFIG_HIGHMEM is not set
203CONFIG_SELECT_MEMORY_MODEL=y 244CONFIG_SELECT_MEMORY_MODEL=y
204CONFIG_FLATMEM_MANUAL=y 245CONFIG_FLATMEM_MANUAL=y
205# CONFIG_DISCONTIGMEM_MANUAL is not set 246# CONFIG_DISCONTIGMEM_MANUAL is not set
206# CONFIG_SPARSEMEM_MANUAL is not set 247# CONFIG_SPARSEMEM_MANUAL is not set
207CONFIG_FLATMEM=y 248CONFIG_FLATMEM=y
208CONFIG_FLAT_NODE_MEM_MAP=y 249CONFIG_FLAT_NODE_MEM_MAP=y
209# CONFIG_SPARSEMEM_STATIC is not set 250CONFIG_PAGEFLAGS_EXTENDED=y
210# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
211CONFIG_SPLIT_PTLOCK_CPUS=4096 251CONFIG_SPLIT_PTLOCK_CPUS=4096
212# CONFIG_RESOURCES_64BIT is not set 252# CONFIG_PHYS_ADDR_T_64BIT is not set
213CONFIG_ZONE_DMA_FLAG=1 253CONFIG_ZONE_DMA_FLAG=0
214CONFIG_BOUNCE=y
215CONFIG_VIRT_TO_BUS=y 254CONFIG_VIRT_TO_BUS=y
255CONFIG_HAVE_MLOCK=y
256CONFIG_HAVE_MLOCKED_PAGE_BIT=y
257CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
216CONFIG_ALIGNMENT_TRAP=y 258CONFIG_ALIGNMENT_TRAP=y
259# CONFIG_UACCESS_WITH_MEMCPY is not set
217 260
218# 261#
219# Boot options 262# Boot options
220# 263#
221CONFIG_ZBOOT_ROM_TEXT=0x0 264CONFIG_ZBOOT_ROM_TEXT=0x0
222CONFIG_ZBOOT_ROM_BSS=0x0 265CONFIG_ZBOOT_ROM_BSS=0x0
223CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc" 266CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc iop3xx_init_atu=y"
224# CONFIG_XIP_KERNEL is not set 267# CONFIG_XIP_KERNEL is not set
225# CONFIG_KEXEC is not set 268# CONFIG_KEXEC is not set
226 269
227# 270#
271# CPU Power Management
272#
273# CONFIG_CPU_IDLE is not set
274
275#
228# Floating point emulation 276# Floating point emulation
229# 277#
230 278
@@ -239,6 +287,8 @@ CONFIG_FPE_NWFPE=y
239# Userspace binary formats 287# Userspace binary formats
240# 288#
241CONFIG_BINFMT_ELF=y 289CONFIG_BINFMT_ELF=y
290# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
291CONFIG_HAVE_AOUT=y
242CONFIG_BINFMT_AOUT=y 292CONFIG_BINFMT_AOUT=y
243# CONFIG_BINFMT_MISC is not set 293# CONFIG_BINFMT_MISC is not set
244# CONFIG_ARTHUR is not set 294# CONFIG_ARTHUR is not set
@@ -247,11 +297,7 @@ CONFIG_BINFMT_AOUT=y
247# Power management options 297# Power management options
248# 298#
249# CONFIG_PM is not set 299# CONFIG_PM is not set
250CONFIG_SUSPEND_UP_POSSIBLE=y 300CONFIG_ARCH_SUSPEND_POSSIBLE=y
251
252#
253# Networking
254#
255CONFIG_NET=y 301CONFIG_NET=y
256 302
257# 303#
@@ -264,6 +310,7 @@ CONFIG_XFRM=y
264# CONFIG_XFRM_USER is not set 310# CONFIG_XFRM_USER is not set
265# CONFIG_XFRM_SUB_POLICY is not set 311# CONFIG_XFRM_SUB_POLICY is not set
266# CONFIG_XFRM_MIGRATE is not set 312# CONFIG_XFRM_MIGRATE is not set
313# CONFIG_XFRM_STATISTICS is not set
267# CONFIG_NET_KEY is not set 314# CONFIG_NET_KEY is not set
268CONFIG_INET=y 315CONFIG_INET=y
269CONFIG_IP_MULTICAST=y 316CONFIG_IP_MULTICAST=y
@@ -310,6 +357,7 @@ CONFIG_IPV6=y
310# CONFIG_IPV6_SIT is not set 357# CONFIG_IPV6_SIT is not set
311# CONFIG_IPV6_TUNNEL is not set 358# CONFIG_IPV6_TUNNEL is not set
312# CONFIG_IPV6_MULTIPLE_TABLES is not set 359# CONFIG_IPV6_MULTIPLE_TABLES is not set
360# CONFIG_IPV6_MROUTE is not set
313# CONFIG_NETWORK_SECMARK is not set 361# CONFIG_NETWORK_SECMARK is not set
314# CONFIG_NETFILTER is not set 362# CONFIG_NETFILTER is not set
315# CONFIG_IP_DCCP is not set 363# CONFIG_IP_DCCP is not set
@@ -317,6 +365,7 @@ CONFIG_IPV6=y
317# CONFIG_TIPC is not set 365# CONFIG_TIPC is not set
318# CONFIG_ATM is not set 366# CONFIG_ATM is not set
319# CONFIG_BRIDGE is not set 367# CONFIG_BRIDGE is not set
368# CONFIG_NET_DSA is not set
320# CONFIG_VLAN_8021Q is not set 369# CONFIG_VLAN_8021Q is not set
321# CONFIG_DECNET is not set 370# CONFIG_DECNET is not set
322# CONFIG_LLC2 is not set 371# CONFIG_LLC2 is not set
@@ -326,24 +375,31 @@ CONFIG_IPV6=y
326# CONFIG_LAPB is not set 375# CONFIG_LAPB is not set
327# CONFIG_ECONET is not set 376# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 377# CONFIG_WAN_ROUTER is not set
378# CONFIG_PHONET is not set
379# CONFIG_IEEE802154 is not set
329# CONFIG_NET_SCHED is not set 380# CONFIG_NET_SCHED is not set
381# CONFIG_DCB is not set
330 382
331# 383#
332# Network testing 384# Network testing
333# 385#
334# CONFIG_NET_PKTGEN is not set 386# CONFIG_NET_PKTGEN is not set
335# CONFIG_HAMRADIO is not set 387# CONFIG_HAMRADIO is not set
388# CONFIG_CAN is not set
336# CONFIG_IRDA is not set 389# CONFIG_IRDA is not set
337# CONFIG_BT is not set 390# CONFIG_BT is not set
338# CONFIG_AF_RXRPC is not set 391# CONFIG_AF_RXRPC is not set
392CONFIG_WIRELESS=y
393# CONFIG_CFG80211 is not set
394# CONFIG_WIRELESS_OLD_REGULATORY is not set
395# CONFIG_WIRELESS_EXT is not set
396# CONFIG_LIB80211 is not set
339 397
340# 398#
341# Wireless 399# CFG80211 needs to be enabled for MAC80211
342# 400#
343# CONFIG_CFG80211 is not set 401CONFIG_MAC80211_DEFAULT_PS_VALUE=0
344# CONFIG_WIRELESS_EXT is not set 402# CONFIG_WIMAX is not set
345# CONFIG_MAC80211 is not set
346# CONFIG_IEEE80211 is not set
347# CONFIG_RFKILL is not set 403# CONFIG_RFKILL is not set
348# CONFIG_NET_9P is not set 404# CONFIG_NET_9P is not set
349 405
@@ -357,7 +413,9 @@ CONFIG_IPV6=y
357CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 413CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
358CONFIG_STANDALONE=y 414CONFIG_STANDALONE=y
359CONFIG_PREVENT_FIRMWARE_BUILD=y 415CONFIG_PREVENT_FIRMWARE_BUILD=y
360# CONFIG_FW_LOADER is not set 416CONFIG_FW_LOADER=y
417CONFIG_FIRMWARE_IN_KERNEL=y
418CONFIG_EXTRA_FIRMWARE=""
361# CONFIG_DEBUG_DRIVER is not set 419# CONFIG_DEBUG_DRIVER is not set
362# CONFIG_DEBUG_DEVRES is not set 420# CONFIG_DEBUG_DEVRES is not set
363# CONFIG_SYS_HYPERVISOR is not set 421# CONFIG_SYS_HYPERVISOR is not set
@@ -366,12 +424,14 @@ CONFIG_MTD=y
366# CONFIG_MTD_DEBUG is not set 424# CONFIG_MTD_DEBUG is not set
367# CONFIG_MTD_CONCAT is not set 425# CONFIG_MTD_CONCAT is not set
368CONFIG_MTD_PARTITIONS=y 426CONFIG_MTD_PARTITIONS=y
427# CONFIG_MTD_TESTS is not set
369CONFIG_MTD_REDBOOT_PARTS=y 428CONFIG_MTD_REDBOOT_PARTS=y
370CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 429CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
371CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 430CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
372CONFIG_MTD_REDBOOT_PARTS_READONLY=y 431CONFIG_MTD_REDBOOT_PARTS_READONLY=y
373# CONFIG_MTD_CMDLINE_PARTS is not set 432# CONFIG_MTD_CMDLINE_PARTS is not set
374# CONFIG_MTD_AFS_PARTS is not set 433# CONFIG_MTD_AFS_PARTS is not set
434# CONFIG_MTD_AR7_PARTS is not set
375 435
376# 436#
377# User Modules And Translation Layers 437# User Modules And Translation Layers
@@ -421,9 +481,7 @@ CONFIG_MTD_CFI_UTIL=y
421# 481#
422# CONFIG_MTD_COMPLEX_MAPPINGS is not set 482# CONFIG_MTD_COMPLEX_MAPPINGS is not set
423CONFIG_MTD_PHYSMAP=y 483CONFIG_MTD_PHYSMAP=y
424CONFIG_MTD_PHYSMAP_START=0x0 484# CONFIG_MTD_PHYSMAP_COMPAT is not set
425CONFIG_MTD_PHYSMAP_LEN=0x0
426CONFIG_MTD_PHYSMAP_BANKWIDTH=1
427# CONFIG_MTD_ARM_INTEGRATOR is not set 485# CONFIG_MTD_ARM_INTEGRATOR is not set
428# CONFIG_MTD_INTEL_VR_NOR is not set 486# CONFIG_MTD_INTEL_VR_NOR is not set
429# CONFIG_MTD_PLATRAM is not set 487# CONFIG_MTD_PLATRAM is not set
@@ -447,6 +505,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1
447# CONFIG_MTD_ONENAND is not set 505# CONFIG_MTD_ONENAND is not set
448 506
449# 507#
508# LPDDR flash memory drivers
509#
510# CONFIG_MTD_LPDDR is not set
511
512#
450# UBI - Unsorted block images 513# UBI - Unsorted block images
451# 514#
452# CONFIG_MTD_UBI is not set 515# CONFIG_MTD_UBI is not set
@@ -463,14 +526,29 @@ CONFIG_BLK_DEV_NBD=y
463CONFIG_BLK_DEV_RAM=y 526CONFIG_BLK_DEV_RAM=y
464CONFIG_BLK_DEV_RAM_COUNT=16 527CONFIG_BLK_DEV_RAM_COUNT=16
465CONFIG_BLK_DEV_RAM_SIZE=8192 528CONFIG_BLK_DEV_RAM_SIZE=8192
466CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 529# CONFIG_BLK_DEV_XIP is not set
467# CONFIG_CDROM_PKTCDVD is not set 530# CONFIG_CDROM_PKTCDVD is not set
468# CONFIG_ATA_OVER_ETH is not set 531# CONFIG_ATA_OVER_ETH is not set
532# CONFIG_MG_DISK is not set
469CONFIG_MISC_DEVICES=y 533CONFIG_MISC_DEVICES=y
470# CONFIG_PHANTOM is not set 534# CONFIG_PHANTOM is not set
471# CONFIG_EEPROM_93CX6 is not set
472# CONFIG_SGI_IOC4 is not set 535# CONFIG_SGI_IOC4 is not set
473# CONFIG_TIFM_CORE is not set 536# CONFIG_TIFM_CORE is not set
537# CONFIG_ICS932S401 is not set
538# CONFIG_ENCLOSURE_SERVICES is not set
539# CONFIG_HP_ILO is not set
540# CONFIG_ISL29003 is not set
541# CONFIG_C2PORT is not set
542
543#
544# EEPROM support
545#
546# CONFIG_EEPROM_AT24 is not set
547# CONFIG_EEPROM_LEGACY is not set
548# CONFIG_EEPROM_MAX6875 is not set
549# CONFIG_EEPROM_93CX6 is not set
550# CONFIG_CB710_CORE is not set
551CONFIG_HAVE_IDE=y
474# CONFIG_IDE is not set 552# CONFIG_IDE is not set
475 553
476# 554#
@@ -492,10 +570,6 @@ CONFIG_BLK_DEV_SD=y
492# CONFIG_BLK_DEV_SR is not set 570# CONFIG_BLK_DEV_SR is not set
493CONFIG_CHR_DEV_SG=y 571CONFIG_CHR_DEV_SG=y
494# CONFIG_CHR_DEV_SCH is not set 572# CONFIG_CHR_DEV_SCH is not set
495
496#
497# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
498#
499# CONFIG_SCSI_MULTI_LUN is not set 573# CONFIG_SCSI_MULTI_LUN is not set
500# CONFIG_SCSI_CONSTANTS is not set 574# CONFIG_SCSI_CONSTANTS is not set
501# CONFIG_SCSI_LOGGING is not set 575# CONFIG_SCSI_LOGGING is not set
@@ -512,6 +586,8 @@ CONFIG_SCSI_WAIT_SCAN=m
512# CONFIG_SCSI_SRP_ATTRS is not set 586# CONFIG_SCSI_SRP_ATTRS is not set
513CONFIG_SCSI_LOWLEVEL=y 587CONFIG_SCSI_LOWLEVEL=y
514# CONFIG_ISCSI_TCP is not set 588# CONFIG_ISCSI_TCP is not set
589# CONFIG_SCSI_CXGB3_ISCSI is not set
590# CONFIG_SCSI_BNX2_ISCSI is not set
515# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 591# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
516# CONFIG_SCSI_3W_9XXX is not set 592# CONFIG_SCSI_3W_9XXX is not set
517# CONFIG_SCSI_ACARD is not set 593# CONFIG_SCSI_ACARD is not set
@@ -520,13 +596,18 @@ CONFIG_SCSI_LOWLEVEL=y
520# CONFIG_SCSI_AIC7XXX_OLD is not set 596# CONFIG_SCSI_AIC7XXX_OLD is not set
521# CONFIG_SCSI_AIC79XX is not set 597# CONFIG_SCSI_AIC79XX is not set
522# CONFIG_SCSI_AIC94XX is not set 598# CONFIG_SCSI_AIC94XX is not set
599# CONFIG_SCSI_MVSAS is not set
523# CONFIG_SCSI_DPT_I2O is not set 600# CONFIG_SCSI_DPT_I2O is not set
524# CONFIG_SCSI_ADVANSYS is not set 601# CONFIG_SCSI_ADVANSYS is not set
525# CONFIG_SCSI_ARCMSR is not set 602# CONFIG_SCSI_ARCMSR is not set
526# CONFIG_MEGARAID_NEWGEN is not set 603# CONFIG_MEGARAID_NEWGEN is not set
527# CONFIG_MEGARAID_LEGACY is not set 604# CONFIG_MEGARAID_LEGACY is not set
528# CONFIG_MEGARAID_SAS is not set 605# CONFIG_MEGARAID_SAS is not set
606# CONFIG_SCSI_MPT2SAS is not set
529# CONFIG_SCSI_HPTIOP is not set 607# CONFIG_SCSI_HPTIOP is not set
608# CONFIG_LIBFC is not set
609# CONFIG_LIBFCOE is not set
610# CONFIG_FCOE is not set
530# CONFIG_SCSI_DMX3191D is not set 611# CONFIG_SCSI_DMX3191D is not set
531# CONFIG_SCSI_FUTURE_DOMAIN is not set 612# CONFIG_SCSI_FUTURE_DOMAIN is not set
532# CONFIG_SCSI_IPS is not set 613# CONFIG_SCSI_IPS is not set
@@ -543,15 +624,18 @@ CONFIG_SCSI_LOWLEVEL=y
543# CONFIG_SCSI_NSP32 is not set 624# CONFIG_SCSI_NSP32 is not set
544# CONFIG_SCSI_DEBUG is not set 625# CONFIG_SCSI_DEBUG is not set
545# CONFIG_SCSI_SRP is not set 626# CONFIG_SCSI_SRP is not set
627# CONFIG_SCSI_DH is not set
628# CONFIG_SCSI_OSD_INITIATOR is not set
546# CONFIG_ATA is not set 629# CONFIG_ATA is not set
547CONFIG_MD=y 630CONFIG_MD=y
548CONFIG_BLK_DEV_MD=y 631CONFIG_BLK_DEV_MD=y
632CONFIG_MD_AUTODETECT=y
549CONFIG_MD_LINEAR=y 633CONFIG_MD_LINEAR=y
550CONFIG_MD_RAID0=y 634CONFIG_MD_RAID0=y
551CONFIG_MD_RAID1=y 635CONFIG_MD_RAID1=y
552# CONFIG_MD_RAID10 is not set 636# CONFIG_MD_RAID10 is not set
553CONFIG_MD_RAID456=y 637CONFIG_MD_RAID456=y
554# CONFIG_MD_RAID5_RESHAPE is not set 638CONFIG_MD_RAID6_PQ=y
555# CONFIG_MD_MULTIPATH is not set 639# CONFIG_MD_MULTIPATH is not set
556# CONFIG_MD_FAULTY is not set 640# CONFIG_MD_FAULTY is not set
557CONFIG_BLK_DEV_DM=y 641CONFIG_BLK_DEV_DM=y
@@ -568,27 +652,34 @@ CONFIG_BLK_DEV_DM=y
568# 652#
569# IEEE 1394 (FireWire) support 653# IEEE 1394 (FireWire) support
570# 654#
655
656#
657# You can enable one or both FireWire driver stacks.
658#
659
660#
661# See the help texts for more information.
662#
571# CONFIG_FIREWIRE is not set 663# CONFIG_FIREWIRE is not set
572# CONFIG_IEEE1394 is not set 664# CONFIG_IEEE1394 is not set
573# CONFIG_I2O is not set 665# CONFIG_I2O is not set
574CONFIG_NETDEVICES=y 666CONFIG_NETDEVICES=y
575# CONFIG_NETDEVICES_MULTIQUEUE is not set
576# CONFIG_DUMMY is not set 667# CONFIG_DUMMY is not set
577# CONFIG_BONDING is not set 668# CONFIG_BONDING is not set
578# CONFIG_MACVLAN is not set 669# CONFIG_MACVLAN is not set
579# CONFIG_EQUALIZER is not set 670# CONFIG_EQUALIZER is not set
580# CONFIG_TUN is not set 671# CONFIG_TUN is not set
581# CONFIG_VETH is not set 672# CONFIG_VETH is not set
582# CONFIG_IP1000 is not set
583# CONFIG_ARCNET is not set 673# CONFIG_ARCNET is not set
584# CONFIG_NET_ETHERNET is not set 674# CONFIG_NET_ETHERNET is not set
585CONFIG_NETDEV_1000=y 675CONFIG_NETDEV_1000=y
586# CONFIG_ACENIC is not set 676# CONFIG_ACENIC is not set
587# CONFIG_DL2K is not set 677# CONFIG_DL2K is not set
588CONFIG_E1000=y 678CONFIG_E1000=y
589CONFIG_E1000_NAPI=y
590# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
591# CONFIG_E1000E is not set 679# CONFIG_E1000E is not set
680# CONFIG_IP1000 is not set
681# CONFIG_IGB is not set
682# CONFIG_IGBVF is not set
592# CONFIG_NS83820 is not set 683# CONFIG_NS83820 is not set
593# CONFIG_HAMACHI is not set 684# CONFIG_HAMACHI is not set
594# CONFIG_YELLOWFIN is not set 685# CONFIG_YELLOWFIN is not set
@@ -596,23 +687,34 @@ CONFIG_E1000_NAPI=y
596# CONFIG_SIS190 is not set 687# CONFIG_SIS190 is not set
597# CONFIG_SKGE is not set 688# CONFIG_SKGE is not set
598# CONFIG_SKY2 is not set 689# CONFIG_SKY2 is not set
599# CONFIG_SK98LIN is not set
600# CONFIG_VIA_VELOCITY is not set 690# CONFIG_VIA_VELOCITY is not set
601# CONFIG_TIGON3 is not set 691# CONFIG_TIGON3 is not set
602# CONFIG_BNX2 is not set 692# CONFIG_BNX2 is not set
693# CONFIG_CNIC is not set
603# CONFIG_QLA3XXX is not set 694# CONFIG_QLA3XXX is not set
604# CONFIG_ATL1 is not set 695# CONFIG_ATL1 is not set
696# CONFIG_ATL1E is not set
697# CONFIG_ATL1C is not set
698# CONFIG_JME is not set
605CONFIG_NETDEV_10000=y 699CONFIG_NETDEV_10000=y
606# CONFIG_CHELSIO_T1 is not set 700# CONFIG_CHELSIO_T1 is not set
701CONFIG_CHELSIO_T3_DEPENDS=y
607# CONFIG_CHELSIO_T3 is not set 702# CONFIG_CHELSIO_T3 is not set
703# CONFIG_ENIC is not set
608# CONFIG_IXGBE is not set 704# CONFIG_IXGBE is not set
609# CONFIG_IXGB is not set 705# CONFIG_IXGB is not set
610# CONFIG_S2IO is not set 706# CONFIG_S2IO is not set
707# CONFIG_VXGE is not set
611# CONFIG_MYRI10GE is not set 708# CONFIG_MYRI10GE is not set
612# CONFIG_NETXEN_NIC is not set 709# CONFIG_NETXEN_NIC is not set
613# CONFIG_NIU is not set 710# CONFIG_NIU is not set
711# CONFIG_MLX4_EN is not set
614# CONFIG_MLX4_CORE is not set 712# CONFIG_MLX4_CORE is not set
615# CONFIG_TEHUTI is not set 713# CONFIG_TEHUTI is not set
714# CONFIG_BNX2X is not set
715# CONFIG_QLGE is not set
716# CONFIG_SFC is not set
717# CONFIG_BE2NET is not set
616# CONFIG_TR is not set 718# CONFIG_TR is not set
617 719
618# 720#
@@ -620,13 +722,16 @@ CONFIG_NETDEV_10000=y
620# 722#
621# CONFIG_WLAN_PRE80211 is not set 723# CONFIG_WLAN_PRE80211 is not set
622# CONFIG_WLAN_80211 is not set 724# CONFIG_WLAN_80211 is not set
725
726#
727# Enable WiMAX (Networking options) to see the WiMAX drivers
728#
623# CONFIG_WAN is not set 729# CONFIG_WAN is not set
624# CONFIG_FDDI is not set 730# CONFIG_FDDI is not set
625# CONFIG_HIPPI is not set 731# CONFIG_HIPPI is not set
626# CONFIG_PPP is not set 732# CONFIG_PPP is not set
627# CONFIG_SLIP is not set 733# CONFIG_SLIP is not set
628# CONFIG_NET_FC is not set 734# CONFIG_NET_FC is not set
629# CONFIG_SHAPER is not set
630# CONFIG_NETCONSOLE is not set 735# CONFIG_NETCONSOLE is not set
631# CONFIG_NETPOLL is not set 736# CONFIG_NETPOLL is not set
632# CONFIG_NET_POLL_CONTROLLER is not set 737# CONFIG_NET_POLL_CONTROLLER is not set
@@ -670,10 +775,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
670# Character devices 775# Character devices
671# 776#
672CONFIG_VT=y 777CONFIG_VT=y
778CONFIG_CONSOLE_TRANSLATIONS=y
673CONFIG_VT_CONSOLE=y 779CONFIG_VT_CONSOLE=y
674CONFIG_HW_CONSOLE=y 780CONFIG_HW_CONSOLE=y
675# CONFIG_VT_HW_CONSOLE_BINDING is not set 781# CONFIG_VT_HW_CONSOLE_BINDING is not set
782CONFIG_DEVKMEM=y
676# CONFIG_SERIAL_NONSTANDARD is not set 783# CONFIG_SERIAL_NONSTANDARD is not set
784# CONFIG_NOZOMI is not set
677 785
678# 786#
679# Serial drivers 787# Serial drivers
@@ -692,11 +800,12 @@ CONFIG_SERIAL_CORE=y
692CONFIG_SERIAL_CORE_CONSOLE=y 800CONFIG_SERIAL_CORE_CONSOLE=y
693# CONFIG_SERIAL_JSM is not set 801# CONFIG_SERIAL_JSM is not set
694CONFIG_UNIX98_PTYS=y 802CONFIG_UNIX98_PTYS=y
803# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
695CONFIG_LEGACY_PTYS=y 804CONFIG_LEGACY_PTYS=y
696CONFIG_LEGACY_PTY_COUNT=256 805CONFIG_LEGACY_PTY_COUNT=256
697# CONFIG_IPMI_HANDLER is not set 806# CONFIG_IPMI_HANDLER is not set
698CONFIG_HW_RANDOM=y 807CONFIG_HW_RANDOM=y
699# CONFIG_NVRAM is not set 808# CONFIG_HW_RANDOM_TIMERIOMEM is not set
700# CONFIG_R3964 is not set 809# CONFIG_R3964 is not set
701# CONFIG_APPLICOM is not set 810# CONFIG_APPLICOM is not set
702# CONFIG_RAW_DRIVER is not set 811# CONFIG_RAW_DRIVER is not set
@@ -705,16 +814,14 @@ CONFIG_DEVPORT=y
705CONFIG_I2C=y 814CONFIG_I2C=y
706CONFIG_I2C_BOARDINFO=y 815CONFIG_I2C_BOARDINFO=y
707CONFIG_I2C_CHARDEV=y 816CONFIG_I2C_CHARDEV=y
817CONFIG_I2C_HELPER_AUTO=y
708 818
709# 819#
710# I2C Algorithms 820# I2C Hardware Bus support
711# 821#
712# CONFIG_I2C_ALGOBIT is not set
713# CONFIG_I2C_ALGOPCF is not set
714# CONFIG_I2C_ALGOPCA is not set
715 822
716# 823#
717# I2C Hardware Bus support 824# PC SMBus host controller drivers
718# 825#
719# CONFIG_I2C_ALI1535 is not set 826# CONFIG_I2C_ALI1535 is not set
720# CONFIG_I2C_ALI1563 is not set 827# CONFIG_I2C_ALI1563 is not set
@@ -722,50 +829,82 @@ CONFIG_I2C_CHARDEV=y
722# CONFIG_I2C_AMD756 is not set 829# CONFIG_I2C_AMD756 is not set
723# CONFIG_I2C_AMD8111 is not set 830# CONFIG_I2C_AMD8111 is not set
724# CONFIG_I2C_I801 is not set 831# CONFIG_I2C_I801 is not set
725# CONFIG_I2C_I810 is not set 832# CONFIG_I2C_ISCH is not set
726# CONFIG_I2C_PIIX4 is not set 833# CONFIG_I2C_PIIX4 is not set
727CONFIG_I2C_IOP3XX=y
728# CONFIG_I2C_NFORCE2 is not set 834# CONFIG_I2C_NFORCE2 is not set
729# CONFIG_I2C_OCORES is not set
730# CONFIG_I2C_PARPORT_LIGHT is not set
731# CONFIG_I2C_PROSAVAGE is not set
732# CONFIG_I2C_SAVAGE4 is not set
733# CONFIG_I2C_SIMTEC is not set
734# CONFIG_I2C_SIS5595 is not set 835# CONFIG_I2C_SIS5595 is not set
735# CONFIG_I2C_SIS630 is not set 836# CONFIG_I2C_SIS630 is not set
736# CONFIG_I2C_SIS96X is not set 837# CONFIG_I2C_SIS96X is not set
737# CONFIG_I2C_TAOS_EVM is not set
738# CONFIG_I2C_STUB is not set
739# CONFIG_I2C_VIA is not set 838# CONFIG_I2C_VIA is not set
740# CONFIG_I2C_VIAPRO is not set 839# CONFIG_I2C_VIAPRO is not set
840
841#
842# I2C system bus drivers (mostly embedded / system-on-chip)
843#
844# CONFIG_I2C_GPIO is not set
845CONFIG_I2C_IOP3XX=y
846# CONFIG_I2C_OCORES is not set
847# CONFIG_I2C_SIMTEC is not set
848
849#
850# External I2C/SMBus adapter drivers
851#
852# CONFIG_I2C_PARPORT_LIGHT is not set
853# CONFIG_I2C_TAOS_EVM is not set
854
855#
856# Graphics adapter I2C/DDC channel drivers
857#
741# CONFIG_I2C_VOODOO3 is not set 858# CONFIG_I2C_VOODOO3 is not set
742 859
743# 860#
861# Other I2C/SMBus bus drivers
862#
863# CONFIG_I2C_PCA_PLATFORM is not set
864# CONFIG_I2C_STUB is not set
865
866#
744# Miscellaneous I2C Chip support 867# Miscellaneous I2C Chip support
745# 868#
746# CONFIG_SENSORS_DS1337 is not set
747# CONFIG_SENSORS_DS1374 is not set
748# CONFIG_DS1682 is not set 869# CONFIG_DS1682 is not set
749# CONFIG_EEPROM_LEGACY is not set
750# CONFIG_SENSORS_PCF8574 is not set 870# CONFIG_SENSORS_PCF8574 is not set
871# CONFIG_PCF8575 is not set
751# CONFIG_SENSORS_PCA9539 is not set 872# CONFIG_SENSORS_PCA9539 is not set
752# CONFIG_SENSORS_PCF8591 is not set
753# CONFIG_SENSORS_MAX6875 is not set
754# CONFIG_SENSORS_TSL2550 is not set 873# CONFIG_SENSORS_TSL2550 is not set
755# CONFIG_I2C_DEBUG_CORE is not set 874# CONFIG_I2C_DEBUG_CORE is not set
756# CONFIG_I2C_DEBUG_ALGO is not set 875# CONFIG_I2C_DEBUG_ALGO is not set
757# CONFIG_I2C_DEBUG_BUS is not set 876# CONFIG_I2C_DEBUG_BUS is not set
758# CONFIG_I2C_DEBUG_CHIP is not set 877# CONFIG_I2C_DEBUG_CHIP is not set
878# CONFIG_SPI is not set
879CONFIG_ARCH_REQUIRE_GPIOLIB=y
880CONFIG_GPIOLIB=y
881# CONFIG_DEBUG_GPIO is not set
882# CONFIG_GPIO_SYSFS is not set
759 883
760# 884#
761# SPI support 885# Memory mapped GPIO expanders:
886#
887
888#
889# I2C GPIO expanders:
890#
891# CONFIG_GPIO_MAX732X is not set
892# CONFIG_GPIO_PCA953X is not set
893# CONFIG_GPIO_PCF857X is not set
894
895#
896# PCI GPIO expanders:
897#
898# CONFIG_GPIO_BT8XX is not set
899
900#
901# SPI GPIO expanders:
762# 902#
763# CONFIG_SPI is not set
764# CONFIG_SPI_MASTER is not set
765# CONFIG_W1 is not set 903# CONFIG_W1 is not set
766# CONFIG_POWER_SUPPLY is not set 904# CONFIG_POWER_SUPPLY is not set
767CONFIG_HWMON=y 905CONFIG_HWMON=y
768# CONFIG_HWMON_VID is not set 906# CONFIG_HWMON_VID is not set
907# CONFIG_SENSORS_AD7414 is not set
769# CONFIG_SENSORS_AD7418 is not set 908# CONFIG_SENSORS_AD7418 is not set
770# CONFIG_SENSORS_ADM1021 is not set 909# CONFIG_SENSORS_ADM1021 is not set
771# CONFIG_SENSORS_ADM1025 is not set 910# CONFIG_SENSORS_ADM1025 is not set
@@ -773,13 +912,17 @@ CONFIG_HWMON=y
773# CONFIG_SENSORS_ADM1029 is not set 912# CONFIG_SENSORS_ADM1029 is not set
774# CONFIG_SENSORS_ADM1031 is not set 913# CONFIG_SENSORS_ADM1031 is not set
775# CONFIG_SENSORS_ADM9240 is not set 914# CONFIG_SENSORS_ADM9240 is not set
915# CONFIG_SENSORS_ADT7462 is not set
776# CONFIG_SENSORS_ADT7470 is not set 916# CONFIG_SENSORS_ADT7470 is not set
917# CONFIG_SENSORS_ADT7473 is not set
918# CONFIG_SENSORS_ADT7475 is not set
777# CONFIG_SENSORS_ATXP1 is not set 919# CONFIG_SENSORS_ATXP1 is not set
778# CONFIG_SENSORS_DS1621 is not set 920# CONFIG_SENSORS_DS1621 is not set
779# CONFIG_SENSORS_I5K_AMB is not set 921# CONFIG_SENSORS_I5K_AMB is not set
780# CONFIG_SENSORS_F71805F is not set 922# CONFIG_SENSORS_F71805F is not set
781# CONFIG_SENSORS_F71882FG is not set 923# CONFIG_SENSORS_F71882FG is not set
782# CONFIG_SENSORS_F75375S is not set 924# CONFIG_SENSORS_F75375S is not set
925# CONFIG_SENSORS_G760A is not set
783# CONFIG_SENSORS_GL518SM is not set 926# CONFIG_SENSORS_GL518SM is not set
784# CONFIG_SENSORS_GL520SM is not set 927# CONFIG_SENSORS_GL520SM is not set
785# CONFIG_SENSORS_IT87 is not set 928# CONFIG_SENSORS_IT87 is not set
@@ -794,16 +937,23 @@ CONFIG_HWMON=y
794# CONFIG_SENSORS_LM90 is not set 937# CONFIG_SENSORS_LM90 is not set
795# CONFIG_SENSORS_LM92 is not set 938# CONFIG_SENSORS_LM92 is not set
796# CONFIG_SENSORS_LM93 is not set 939# CONFIG_SENSORS_LM93 is not set
940# CONFIG_SENSORS_LTC4215 is not set
941# CONFIG_SENSORS_LTC4245 is not set
942# CONFIG_SENSORS_LM95241 is not set
797# CONFIG_SENSORS_MAX1619 is not set 943# CONFIG_SENSORS_MAX1619 is not set
798# CONFIG_SENSORS_MAX6650 is not set 944# CONFIG_SENSORS_MAX6650 is not set
799# CONFIG_SENSORS_PC87360 is not set 945# CONFIG_SENSORS_PC87360 is not set
800# CONFIG_SENSORS_PC87427 is not set 946# CONFIG_SENSORS_PC87427 is not set
947# CONFIG_SENSORS_PCF8591 is not set
948# CONFIG_SENSORS_SHT15 is not set
801# CONFIG_SENSORS_SIS5595 is not set 949# CONFIG_SENSORS_SIS5595 is not set
802# CONFIG_SENSORS_DME1737 is not set 950# CONFIG_SENSORS_DME1737 is not set
803# CONFIG_SENSORS_SMSC47M1 is not set 951# CONFIG_SENSORS_SMSC47M1 is not set
804# CONFIG_SENSORS_SMSC47M192 is not set 952# CONFIG_SENSORS_SMSC47M192 is not set
805# CONFIG_SENSORS_SMSC47B397 is not set 953# CONFIG_SENSORS_SMSC47B397 is not set
954# CONFIG_SENSORS_ADS7828 is not set
806# CONFIG_SENSORS_THMC50 is not set 955# CONFIG_SENSORS_THMC50 is not set
956# CONFIG_SENSORS_TMP401 is not set
807# CONFIG_SENSORS_VIA686A is not set 957# CONFIG_SENSORS_VIA686A is not set
808# CONFIG_SENSORS_VT1211 is not set 958# CONFIG_SENSORS_VT1211 is not set
809# CONFIG_SENSORS_VT8231 is not set 959# CONFIG_SENSORS_VT8231 is not set
@@ -812,28 +962,38 @@ CONFIG_HWMON=y
812# CONFIG_SENSORS_W83792D is not set 962# CONFIG_SENSORS_W83792D is not set
813# CONFIG_SENSORS_W83793 is not set 963# CONFIG_SENSORS_W83793 is not set
814# CONFIG_SENSORS_W83L785TS is not set 964# CONFIG_SENSORS_W83L785TS is not set
965# CONFIG_SENSORS_W83L786NG is not set
815# CONFIG_SENSORS_W83627HF is not set 966# CONFIG_SENSORS_W83627HF is not set
816# CONFIG_SENSORS_W83627EHF is not set 967# CONFIG_SENSORS_W83627EHF is not set
817# CONFIG_HWMON_DEBUG_CHIP is not set 968# CONFIG_HWMON_DEBUG_CHIP is not set
969# CONFIG_THERMAL is not set
970# CONFIG_THERMAL_HWMON is not set
818# CONFIG_WATCHDOG is not set 971# CONFIG_WATCHDOG is not set
972CONFIG_SSB_POSSIBLE=y
819 973
820# 974#
821# Sonics Silicon Backplane 975# Sonics Silicon Backplane
822# 976#
823CONFIG_SSB_POSSIBLE=y
824# CONFIG_SSB is not set 977# CONFIG_SSB is not set
825 978
826# 979#
827# Multifunction device drivers 980# Multifunction device drivers
828# 981#
982# CONFIG_MFD_CORE is not set
829# CONFIG_MFD_SM501 is not set 983# CONFIG_MFD_SM501 is not set
830 984# CONFIG_MFD_ASIC3 is not set
831# 985# CONFIG_HTC_EGPIO is not set
832# Multimedia devices 986# CONFIG_HTC_PASIC3 is not set
833# 987# CONFIG_TPS65010 is not set
834# CONFIG_VIDEO_DEV is not set 988# CONFIG_TWL4030_CORE is not set
835# CONFIG_DVB_CORE is not set 989# CONFIG_MFD_TMIO is not set
836CONFIG_DAB=y 990# CONFIG_MFD_TC6393XB is not set
991# CONFIG_PMIC_DA903X is not set
992# CONFIG_MFD_WM8400 is not set
993# CONFIG_MFD_WM8350_I2C is not set
994# CONFIG_MFD_PCF50633 is not set
995# CONFIG_AB3100_CORE is not set
996# CONFIG_MEDIA_SUPPORT is not set
837 997
838# 998#
839# Graphics support 999# Graphics support
@@ -854,15 +1014,16 @@ CONFIG_DAB=y
854# 1014#
855# CONFIG_VGA_CONSOLE is not set 1015# CONFIG_VGA_CONSOLE is not set
856CONFIG_DUMMY_CONSOLE=y 1016CONFIG_DUMMY_CONSOLE=y
857
858#
859# Sound
860#
861# CONFIG_SOUND is not set 1017# CONFIG_SOUND is not set
862CONFIG_HID_SUPPORT=y 1018CONFIG_HID_SUPPORT=y
863CONFIG_HID=y 1019CONFIG_HID=y
864# CONFIG_HID_DEBUG is not set 1020# CONFIG_HID_DEBUG is not set
865# CONFIG_HIDRAW is not set 1021# CONFIG_HIDRAW is not set
1022# CONFIG_HID_PID is not set
1023
1024#
1025# Special HID drivers
1026#
866CONFIG_USB_SUPPORT=y 1027CONFIG_USB_SUPPORT=y
867CONFIG_USB_ARCH_HAS_HCD=y 1028CONFIG_USB_ARCH_HAS_HCD=y
868CONFIG_USB_ARCH_HAS_OHCI=y 1029CONFIG_USB_ARCH_HAS_OHCI=y
@@ -870,14 +1031,21 @@ CONFIG_USB_ARCH_HAS_EHCI=y
870# CONFIG_USB is not set 1031# CONFIG_USB is not set
871 1032
872# 1033#
873# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 1034# Enable Host or Gadget support to see Inventra options
874# 1035#
875 1036
876# 1037#
877# USB Gadget Support 1038# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
878# 1039#
879# CONFIG_USB_GADGET is not set 1040# CONFIG_USB_GADGET is not set
1041
1042#
1043# OTG and related infrastructure
1044#
1045# CONFIG_UWB is not set
880# CONFIG_MMC is not set 1046# CONFIG_MMC is not set
1047# CONFIG_MEMSTICK is not set
1048# CONFIG_ACCESSIBILITY is not set
881# CONFIG_NEW_LEDS is not set 1049# CONFIG_NEW_LEDS is not set
882CONFIG_RTC_LIB=y 1050CONFIG_RTC_LIB=y
883# CONFIG_RTC_CLASS is not set 1051# CONFIG_RTC_CLASS is not set
@@ -893,6 +1061,12 @@ CONFIG_DMA_ENGINE=y
893# DMA Clients 1061# DMA Clients
894# 1062#
895CONFIG_NET_DMA=y 1063CONFIG_NET_DMA=y
1064# CONFIG_ASYNC_TX_DMA is not set
1065# CONFIG_DMATEST is not set
1066# CONFIG_AUXDISPLAY is not set
1067# CONFIG_REGULATOR is not set
1068# CONFIG_UIO is not set
1069# CONFIG_STAGING is not set
896 1070
897# 1071#
898# File systems 1072# File systems
@@ -901,10 +1075,11 @@ CONFIG_EXT2_FS=y
901# CONFIG_EXT2_FS_XATTR is not set 1075# CONFIG_EXT2_FS_XATTR is not set
902# CONFIG_EXT2_FS_XIP is not set 1076# CONFIG_EXT2_FS_XIP is not set
903CONFIG_EXT3_FS=y 1077CONFIG_EXT3_FS=y
1078# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
904CONFIG_EXT3_FS_XATTR=y 1079CONFIG_EXT3_FS_XATTR=y
905# CONFIG_EXT3_FS_POSIX_ACL is not set 1080# CONFIG_EXT3_FS_POSIX_ACL is not set
906# CONFIG_EXT3_FS_SECURITY is not set 1081# CONFIG_EXT3_FS_SECURITY is not set
907# CONFIG_EXT4DEV_FS is not set 1082# CONFIG_EXT4_FS is not set
908CONFIG_JBD=y 1083CONFIG_JBD=y
909CONFIG_FS_MBCACHE=y 1084CONFIG_FS_MBCACHE=y
910# CONFIG_REISERFS_FS is not set 1085# CONFIG_REISERFS_FS is not set
@@ -913,17 +1088,23 @@ CONFIG_FS_MBCACHE=y
913# CONFIG_XFS_FS is not set 1088# CONFIG_XFS_FS is not set
914# CONFIG_GFS2_FS is not set 1089# CONFIG_GFS2_FS is not set
915# CONFIG_OCFS2_FS is not set 1090# CONFIG_OCFS2_FS is not set
916# CONFIG_MINIX_FS is not set 1091# CONFIG_BTRFS_FS is not set
917# CONFIG_ROMFS_FS is not set 1092CONFIG_FILE_LOCKING=y
1093CONFIG_FSNOTIFY=y
1094CONFIG_DNOTIFY=y
918CONFIG_INOTIFY=y 1095CONFIG_INOTIFY=y
919CONFIG_INOTIFY_USER=y 1096CONFIG_INOTIFY_USER=y
920# CONFIG_QUOTA is not set 1097# CONFIG_QUOTA is not set
921CONFIG_DNOTIFY=y
922# CONFIG_AUTOFS_FS is not set 1098# CONFIG_AUTOFS_FS is not set
923# CONFIG_AUTOFS4_FS is not set 1099# CONFIG_AUTOFS4_FS is not set
924# CONFIG_FUSE_FS is not set 1100# CONFIG_FUSE_FS is not set
925 1101
926# 1102#
1103# Caches
1104#
1105# CONFIG_FSCACHE is not set
1106
1107#
927# CD-ROM/DVD Filesystems 1108# CD-ROM/DVD Filesystems
928# 1109#
929# CONFIG_ISO9660_FS is not set 1110# CONFIG_ISO9660_FS is not set
@@ -941,15 +1122,13 @@ CONFIG_DNOTIFY=y
941# 1122#
942CONFIG_PROC_FS=y 1123CONFIG_PROC_FS=y
943CONFIG_PROC_SYSCTL=y 1124CONFIG_PROC_SYSCTL=y
1125CONFIG_PROC_PAGE_MONITOR=y
944CONFIG_SYSFS=y 1126CONFIG_SYSFS=y
945CONFIG_TMPFS=y 1127CONFIG_TMPFS=y
946# CONFIG_TMPFS_POSIX_ACL is not set 1128# CONFIG_TMPFS_POSIX_ACL is not set
947# CONFIG_HUGETLB_PAGE is not set 1129# CONFIG_HUGETLB_PAGE is not set
948# CONFIG_CONFIGFS_FS is not set 1130# CONFIG_CONFIGFS_FS is not set
949 1131CONFIG_MISC_FILESYSTEMS=y
950#
951# Miscellaneous filesystems
952#
953# CONFIG_ADFS_FS is not set 1132# CONFIG_ADFS_FS is not set
954# CONFIG_AFFS_FS is not set 1133# CONFIG_AFFS_FS is not set
955# CONFIG_HFS_FS is not set 1134# CONFIG_HFS_FS is not set
@@ -959,29 +1138,31 @@ CONFIG_TMPFS=y
959# CONFIG_EFS_FS is not set 1138# CONFIG_EFS_FS is not set
960# CONFIG_JFFS2_FS is not set 1139# CONFIG_JFFS2_FS is not set
961CONFIG_CRAMFS=y 1140CONFIG_CRAMFS=y
1141# CONFIG_SQUASHFS is not set
962# CONFIG_VXFS_FS is not set 1142# CONFIG_VXFS_FS is not set
1143# CONFIG_MINIX_FS is not set
1144# CONFIG_OMFS_FS is not set
963# CONFIG_HPFS_FS is not set 1145# CONFIG_HPFS_FS is not set
964# CONFIG_QNX4FS_FS is not set 1146# CONFIG_QNX4FS_FS is not set
1147# CONFIG_ROMFS_FS is not set
965# CONFIG_SYSV_FS is not set 1148# CONFIG_SYSV_FS is not set
966# CONFIG_UFS_FS is not set 1149# CONFIG_UFS_FS is not set
1150# CONFIG_NILFS2_FS is not set
967CONFIG_NETWORK_FILESYSTEMS=y 1151CONFIG_NETWORK_FILESYSTEMS=y
968CONFIG_NFS_FS=y 1152CONFIG_NFS_FS=y
969CONFIG_NFS_V3=y 1153CONFIG_NFS_V3=y
970# CONFIG_NFS_V3_ACL is not set 1154# CONFIG_NFS_V3_ACL is not set
971# CONFIG_NFS_V4 is not set 1155# CONFIG_NFS_V4 is not set
972# CONFIG_NFS_DIRECTIO is not set 1156CONFIG_ROOT_NFS=y
973CONFIG_NFSD=y 1157CONFIG_NFSD=y
974CONFIG_NFSD_V3=y 1158CONFIG_NFSD_V3=y
975# CONFIG_NFSD_V3_ACL is not set 1159# CONFIG_NFSD_V3_ACL is not set
976# CONFIG_NFSD_V4 is not set 1160# CONFIG_NFSD_V4 is not set
977# CONFIG_NFSD_TCP is not set
978CONFIG_ROOT_NFS=y
979CONFIG_LOCKD=y 1161CONFIG_LOCKD=y
980CONFIG_LOCKD_V4=y 1162CONFIG_LOCKD_V4=y
981CONFIG_EXPORTFS=y 1163CONFIG_EXPORTFS=y
982CONFIG_NFS_COMMON=y 1164CONFIG_NFS_COMMON=y
983CONFIG_SUNRPC=y 1165CONFIG_SUNRPC=y
984# CONFIG_SUNRPC_BIND34 is not set
985# CONFIG_RPCSEC_GSS_KRB5 is not set 1166# CONFIG_RPCSEC_GSS_KRB5 is not set
986# CONFIG_RPCSEC_GSS_SPKM3 is not set 1167# CONFIG_RPCSEC_GSS_SPKM3 is not set
987# CONFIG_SMB_FS is not set 1168# CONFIG_SMB_FS is not set
@@ -1013,9 +1194,6 @@ CONFIG_MSDOS_PARTITION=y
1013# CONFIG_SYSV68_PARTITION is not set 1194# CONFIG_SYSV68_PARTITION is not set
1014# CONFIG_NLS is not set 1195# CONFIG_NLS is not set
1015# CONFIG_DLM is not set 1196# CONFIG_DLM is not set
1016CONFIG_INSTRUMENTATION=y
1017# CONFIG_PROFILING is not set
1018# CONFIG_MARKERS is not set
1019 1197
1020# 1198#
1021# Kernel hacking 1199# Kernel hacking
@@ -1023,6 +1201,7 @@ CONFIG_INSTRUMENTATION=y
1023# CONFIG_PRINTK_TIME is not set 1201# CONFIG_PRINTK_TIME is not set
1024CONFIG_ENABLE_WARN_DEPRECATED=y 1202CONFIG_ENABLE_WARN_DEPRECATED=y
1025CONFIG_ENABLE_MUST_CHECK=y 1203CONFIG_ENABLE_MUST_CHECK=y
1204CONFIG_FRAME_WARN=1024
1026CONFIG_MAGIC_SYSRQ=y 1205CONFIG_MAGIC_SYSRQ=y
1027# CONFIG_UNUSED_SYMBOLS is not set 1206# CONFIG_UNUSED_SYMBOLS is not set
1028# CONFIG_DEBUG_FS is not set 1207# CONFIG_DEBUG_FS is not set
@@ -1030,10 +1209,17 @@ CONFIG_MAGIC_SYSRQ=y
1030CONFIG_DEBUG_KERNEL=y 1209CONFIG_DEBUG_KERNEL=y
1031# CONFIG_DEBUG_SHIRQ is not set 1210# CONFIG_DEBUG_SHIRQ is not set
1032CONFIG_DETECT_SOFTLOCKUP=y 1211CONFIG_DETECT_SOFTLOCKUP=y
1212# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1213CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1214CONFIG_DETECT_HUNG_TASK=y
1215# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1216CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1033CONFIG_SCHED_DEBUG=y 1217CONFIG_SCHED_DEBUG=y
1034# CONFIG_SCHEDSTATS is not set 1218# CONFIG_SCHEDSTATS is not set
1035# CONFIG_TIMER_STATS is not set 1219# CONFIG_TIMER_STATS is not set
1220# CONFIG_DEBUG_OBJECTS is not set
1036# CONFIG_DEBUG_SLAB is not set 1221# CONFIG_DEBUG_SLAB is not set
1222# CONFIG_DEBUG_KMEMLEAK is not set
1037# CONFIG_DEBUG_RT_MUTEXES is not set 1223# CONFIG_DEBUG_RT_MUTEXES is not set
1038# CONFIG_RT_MUTEX_TESTER is not set 1224# CONFIG_RT_MUTEX_TESTER is not set
1039# CONFIG_DEBUG_SPINLOCK is not set 1225# CONFIG_DEBUG_SPINLOCK is not set
@@ -1047,16 +1233,41 @@ CONFIG_SCHED_DEBUG=y
1047CONFIG_DEBUG_BUGVERBOSE=y 1233CONFIG_DEBUG_BUGVERBOSE=y
1048# CONFIG_DEBUG_INFO is not set 1234# CONFIG_DEBUG_INFO is not set
1049# CONFIG_DEBUG_VM is not set 1235# CONFIG_DEBUG_VM is not set
1236# CONFIG_DEBUG_WRITECOUNT is not set
1237CONFIG_DEBUG_MEMORY_INIT=y
1050# CONFIG_DEBUG_LIST is not set 1238# CONFIG_DEBUG_LIST is not set
1051# CONFIG_DEBUG_SG is not set 1239# CONFIG_DEBUG_SG is not set
1240# CONFIG_DEBUG_NOTIFIERS is not set
1052CONFIG_FRAME_POINTER=y 1241CONFIG_FRAME_POINTER=y
1053# CONFIG_FORCED_INLINING is not set
1054# CONFIG_BOOT_PRINTK_DELAY is not set 1242# CONFIG_BOOT_PRINTK_DELAY is not set
1055# CONFIG_RCU_TORTURE_TEST is not set 1243# CONFIG_RCU_TORTURE_TEST is not set
1244# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1245# CONFIG_BACKTRACE_SELF_TEST is not set
1246# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1056# CONFIG_FAULT_INJECTION is not set 1247# CONFIG_FAULT_INJECTION is not set
1248# CONFIG_LATENCYTOP is not set
1249# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1250# CONFIG_PAGE_POISONING is not set
1251CONFIG_HAVE_FUNCTION_TRACER=y
1252CONFIG_TRACING_SUPPORT=y
1253CONFIG_FTRACE=y
1254# CONFIG_FUNCTION_TRACER is not set
1255# CONFIG_SCHED_TRACER is not set
1256# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1257# CONFIG_BOOT_TRACER is not set
1258CONFIG_BRANCH_PROFILE_NONE=y
1259# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1260# CONFIG_PROFILE_ALL_BRANCHES is not set
1261# CONFIG_STACK_TRACER is not set
1262# CONFIG_KMEMTRACE is not set
1263# CONFIG_WORKQUEUE_TRACER is not set
1264# CONFIG_BLK_DEV_IO_TRACE is not set
1057# CONFIG_SAMPLES is not set 1265# CONFIG_SAMPLES is not set
1266CONFIG_HAVE_ARCH_KGDB=y
1267# CONFIG_KGDB is not set
1058CONFIG_DEBUG_USER=y 1268CONFIG_DEBUG_USER=y
1059# CONFIG_DEBUG_ERRORS is not set 1269# CONFIG_DEBUG_ERRORS is not set
1270# CONFIG_DEBUG_STACK_USAGE is not set
1060CONFIG_DEBUG_LL=y 1271CONFIG_DEBUG_LL=y
1061# CONFIG_DEBUG_ICEDCC is not set 1272# CONFIG_DEBUG_ICEDCC is not set
1062 1273
@@ -1065,24 +1276,117 @@ CONFIG_DEBUG_LL=y
1065# 1276#
1066# CONFIG_KEYS is not set 1277# CONFIG_KEYS is not set
1067# CONFIG_SECURITY is not set 1278# CONFIG_SECURITY is not set
1279# CONFIG_SECURITYFS is not set
1068# CONFIG_SECURITY_FILE_CAPABILITIES is not set 1280# CONFIG_SECURITY_FILE_CAPABILITIES is not set
1069CONFIG_XOR_BLOCKS=y 1281CONFIG_XOR_BLOCKS=y
1070CONFIG_ASYNC_CORE=y 1282CONFIG_ASYNC_CORE=y
1071CONFIG_ASYNC_MEMCPY=y 1283CONFIG_ASYNC_MEMCPY=y
1072CONFIG_ASYNC_XOR=y 1284CONFIG_ASYNC_XOR=y
1073# CONFIG_CRYPTO is not set 1285CONFIG_CRYPTO=y
1286
1287#
1288# Crypto core or helper
1289#
1290# CONFIG_CRYPTO_FIPS is not set
1291# CONFIG_CRYPTO_MANAGER is not set
1292# CONFIG_CRYPTO_MANAGER2 is not set
1293# CONFIG_CRYPTO_GF128MUL is not set
1294# CONFIG_CRYPTO_NULL is not set
1295# CONFIG_CRYPTO_CRYPTD is not set
1296# CONFIG_CRYPTO_AUTHENC is not set
1297# CONFIG_CRYPTO_TEST is not set
1298
1299#
1300# Authenticated Encryption with Associated Data
1301#
1302# CONFIG_CRYPTO_CCM is not set
1303# CONFIG_CRYPTO_GCM is not set
1304# CONFIG_CRYPTO_SEQIV is not set
1305
1306#
1307# Block modes
1308#
1309# CONFIG_CRYPTO_CBC is not set
1310# CONFIG_CRYPTO_CTR is not set
1311# CONFIG_CRYPTO_CTS is not set
1312# CONFIG_CRYPTO_ECB is not set
1313# CONFIG_CRYPTO_LRW is not set
1314# CONFIG_CRYPTO_PCBC is not set
1315# CONFIG_CRYPTO_XTS is not set
1316
1317#
1318# Hash modes
1319#
1320# CONFIG_CRYPTO_HMAC is not set
1321# CONFIG_CRYPTO_XCBC is not set
1322
1323#
1324# Digest
1325#
1326# CONFIG_CRYPTO_CRC32C is not set
1327# CONFIG_CRYPTO_MD4 is not set
1328# CONFIG_CRYPTO_MD5 is not set
1329# CONFIG_CRYPTO_MICHAEL_MIC is not set
1330# CONFIG_CRYPTO_RMD128 is not set
1331# CONFIG_CRYPTO_RMD160 is not set
1332# CONFIG_CRYPTO_RMD256 is not set
1333# CONFIG_CRYPTO_RMD320 is not set
1334# CONFIG_CRYPTO_SHA1 is not set
1335# CONFIG_CRYPTO_SHA256 is not set
1336# CONFIG_CRYPTO_SHA512 is not set
1337# CONFIG_CRYPTO_TGR192 is not set
1338# CONFIG_CRYPTO_WP512 is not set
1339
1340#
1341# Ciphers
1342#
1343# CONFIG_CRYPTO_AES is not set
1344# CONFIG_CRYPTO_ANUBIS is not set
1345# CONFIG_CRYPTO_ARC4 is not set
1346# CONFIG_CRYPTO_BLOWFISH is not set
1347# CONFIG_CRYPTO_CAMELLIA is not set
1348# CONFIG_CRYPTO_CAST5 is not set
1349# CONFIG_CRYPTO_CAST6 is not set
1350# CONFIG_CRYPTO_DES is not set
1351# CONFIG_CRYPTO_FCRYPT is not set
1352# CONFIG_CRYPTO_KHAZAD is not set
1353# CONFIG_CRYPTO_SALSA20 is not set
1354# CONFIG_CRYPTO_SEED is not set
1355# CONFIG_CRYPTO_SERPENT is not set
1356# CONFIG_CRYPTO_TEA is not set
1357# CONFIG_CRYPTO_TWOFISH is not set
1358
1359#
1360# Compression
1361#
1362# CONFIG_CRYPTO_DEFLATE is not set
1363# CONFIG_CRYPTO_ZLIB is not set
1364# CONFIG_CRYPTO_LZO is not set
1365
1366#
1367# Random Number Generation
1368#
1369# CONFIG_CRYPTO_ANSI_CPRNG is not set
1370CONFIG_CRYPTO_HW=y
1371# CONFIG_CRYPTO_DEV_HIFN_795X is not set
1372# CONFIG_BINARY_PRINTF is not set
1074 1373
1075# 1374#
1076# Library routines 1375# Library routines
1077# 1376#
1377CONFIG_GENERIC_FIND_LAST_BIT=y
1078# CONFIG_CRC_CCITT is not set 1378# CONFIG_CRC_CCITT is not set
1079# CONFIG_CRC16 is not set 1379# CONFIG_CRC16 is not set
1380# CONFIG_CRC_T10DIF is not set
1080# CONFIG_CRC_ITU_T is not set 1381# CONFIG_CRC_ITU_T is not set
1081# CONFIG_CRC32 is not set 1382# CONFIG_CRC32 is not set
1082# CONFIG_CRC7 is not set 1383# CONFIG_CRC7 is not set
1083# CONFIG_LIBCRC32C is not set 1384# CONFIG_LIBCRC32C is not set
1084CONFIG_ZLIB_INFLATE=y 1385CONFIG_ZLIB_INFLATE=y
1085CONFIG_PLIST=y 1386CONFIG_DECOMPRESS_GZIP=y
1387CONFIG_DECOMPRESS_BZIP2=y
1388CONFIG_DECOMPRESS_LZMA=y
1086CONFIG_HAS_IOMEM=y 1389CONFIG_HAS_IOMEM=y
1087CONFIG_HAS_IOPORT=y 1390CONFIG_HAS_IOPORT=y
1088CONFIG_HAS_DMA=y 1391CONFIG_HAS_DMA=y
1392CONFIG_NLATTR=y
diff --git a/arch/arm/include/asm/glue.h b/arch/arm/include/asm/glue.h
index a0e39d5d00c9..234a3fc1c78e 100644
--- a/arch/arm/include/asm/glue.h
+++ b/arch/arm/include/asm/glue.h
@@ -120,25 +120,39 @@
120#endif 120#endif
121 121
122/* 122/*
123 * Prefetch abort handler. If the CPU has an IFAR use that, otherwise 123 * Prefetch Abort Model
124 * use the address of the aborted instruction 124 * ================
125 *
126 * We have the following to choose from:
127 * legacy - no IFSR, no IFAR
128 * v6 - ARMv6: IFSR, no IFAR
129 * v7 - ARMv7: IFSR and IFAR
125 */ 130 */
131
126#undef CPU_PABORT_HANDLER 132#undef CPU_PABORT_HANDLER
127#undef MULTI_PABORT 133#undef MULTI_PABORT
128 134
129#ifdef CONFIG_CPU_PABRT_IFAR 135#ifdef CONFIG_CPU_PABRT_LEGACY
136# ifdef CPU_PABORT_HANDLER
137# define MULTI_PABORT 1
138# else
139# define CPU_PABORT_HANDLER legacy_pabort
140# endif
141#endif
142
143#ifdef CONFIG_CPU_PABRT_V6
130# ifdef CPU_PABORT_HANDLER 144# ifdef CPU_PABORT_HANDLER
131# define MULTI_PABORT 1 145# define MULTI_PABORT 1
132# else 146# else
133# define CPU_PABORT_HANDLER(reg, insn) mrc p15, 0, reg, cr6, cr0, 2 147# define CPU_PABORT_HANDLER v6_pabort
134# endif 148# endif
135#endif 149#endif
136 150
137#ifdef CONFIG_CPU_PABRT_NOIFAR 151#ifdef CONFIG_CPU_PABRT_V7
138# ifdef CPU_PABORT_HANDLER 152# ifdef CPU_PABORT_HANDLER
139# define MULTI_PABORT 1 153# define MULTI_PABORT 1
140# else 154# else
141# define CPU_PABORT_HANDLER(reg, insn) mov reg, insn 155# define CPU_PABORT_HANDLER v7_pabort
142# endif 156# endif
143#endif 157#endif
144 158
diff --git a/arch/arm/include/asm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h
index 4b8e7f559929..8d60ad267e3a 100644
--- a/arch/arm/include/asm/hardware/iop3xx.h
+++ b/arch/arm/include/asm/hardware/iop3xx.h
@@ -215,6 +215,7 @@ extern int iop3xx_get_init_atu(void);
215 * IOP3XX I/O and Mem space regions for PCI autoconfiguration 215 * IOP3XX I/O and Mem space regions for PCI autoconfiguration
216 */ 216 */
217#define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 217#define IOP3XX_PCI_LOWER_MEM_PA 0x80000000
218#define IOP3XX_PCI_MEM_WINDOW_SIZE 0x08000000
218 219
219#define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 220#define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000
220#define IOP3XX_PCI_LOWER_IO_PA 0x90000000 221#define IOP3XX_PCI_LOWER_IO_PA 0x90000000
diff --git a/arch/arm/include/asm/smp_plat.h b/arch/arm/include/asm/smp_plat.h
new file mode 100644
index 000000000000..59303e200845
--- /dev/null
+++ b/arch/arm/include/asm/smp_plat.h
@@ -0,0 +1,16 @@
1/*
2 * ARM specific SMP header, this contains our implementation
3 * details.
4 */
5#ifndef __ASMARM_SMP_PLAT_H
6#define __ASMARM_SMP_PLAT_H
7
8#include <asm/cputype.h>
9
10/* all SMP configurations have the extended CPUID registers */
11static inline int tlb_ops_need_broadcast(void)
12{
13 return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 2;
14}
15
16#endif
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index 89f7eade20af..7020217fc49f 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -456,6 +456,7 @@
456 * Unimplemented (or alternatively implemented) syscalls 456 * Unimplemented (or alternatively implemented) syscalls
457 */ 457 */
458#define __IGNORE_fadvise64_64 1 458#define __IGNORE_fadvise64_64 1
459#define __IGNORE_migrate_pages 1
459 460
460#endif /* __KERNEL__ */ 461#endif /* __KERNEL__ */
461#endif /* __ASM_ARM_UNISTD_H */ 462#endif /* __ASM_ARM_UNISTD_H */
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 0a2ba51cf35d..322410be573c 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -311,22 +311,16 @@ __pabt_svc:
311 tst r3, #PSR_I_BIT 311 tst r3, #PSR_I_BIT
312 biceq r9, r9, #PSR_I_BIT 312 biceq r9, r9, #PSR_I_BIT
313 313
314 @
315 @ set args, then call main handler
316 @
317 @ r0 - address of faulting instruction
318 @ r1 - pointer to registers on stack
319 @
320#ifdef MULTI_PABORT
321 mov r0, r2 @ pass address of aborted instruction. 314 mov r0, r2 @ pass address of aborted instruction.
315#ifdef MULTI_PABORT
322 ldr r4, .LCprocfns 316 ldr r4, .LCprocfns
323 mov lr, pc 317 mov lr, pc
324 ldr pc, [r4, #PROCESSOR_PABT_FUNC] 318 ldr pc, [r4, #PROCESSOR_PABT_FUNC]
325#else 319#else
326 CPU_PABORT_HANDLER(r0, r2) 320 bl CPU_PABORT_HANDLER
327#endif 321#endif
328 msr cpsr_c, r9 @ Maybe enable interrupts 322 msr cpsr_c, r9 @ Maybe enable interrupts
329 mov r1, sp @ regs 323 mov r2, sp @ regs
330 bl do_PrefetchAbort @ call abort handler 324 bl do_PrefetchAbort @ call abort handler
331 325
332 @ 326 @
@@ -701,16 +695,16 @@ ENDPROC(__und_usr_unknown)
701__pabt_usr: 695__pabt_usr:
702 usr_entry 696 usr_entry
703 697
704#ifdef MULTI_PABORT
705 mov r0, r2 @ pass address of aborted instruction. 698 mov r0, r2 @ pass address of aborted instruction.
699#ifdef MULTI_PABORT
706 ldr r4, .LCprocfns 700 ldr r4, .LCprocfns
707 mov lr, pc 701 mov lr, pc
708 ldr pc, [r4, #PROCESSOR_PABT_FUNC] 702 ldr pc, [r4, #PROCESSOR_PABT_FUNC]
709#else 703#else
710 CPU_PABORT_HANDLER(r0, r2) 704 bl CPU_PABORT_HANDLER
711#endif 705#endif
712 enable_irq @ Enable interrupts 706 enable_irq @ Enable interrupts
713 mov r1, sp @ regs 707 mov r2, sp @ regs
714 bl do_PrefetchAbort @ call abort handler 708 bl do_PrefetchAbort @ call abort handler
715 UNWIND(.fnend ) 709 UNWIND(.fnend )
716 /* fall through */ 710 /* fall through */
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 807cfebb0f44..f0fe95b7085d 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -126,7 +126,7 @@ ENTRY(__gnu_mcount_nc)
126 cmp r0, r2 126 cmp r0, r2
127 bne gnu_trace 127 bne gnu_trace
128 ldmia sp!, {r0-r3, ip, lr} 128 ldmia sp!, {r0-r3, ip, lr}
129 bx ip 129 mov pc, ip
130 130
131gnu_trace: 131gnu_trace:
132 ldr r1, [sp, #20] @ lr of instrumented routine 132 ldr r1, [sp, #20] @ lr of instrumented routine
@@ -135,7 +135,7 @@ gnu_trace:
135 mov lr, pc 135 mov lr, pc
136 mov pc, r2 136 mov pc, r2
137 ldmia sp!, {r0-r3, ip, lr} 137 ldmia sp!, {r0-r3, ip, lr}
138 bx ip 138 mov pc, ip
139 139
140ENTRY(mcount) 140ENTRY(mcount)
141 stmdb sp!, {r0-r3, lr} 141 stmdb sp!, {r0-r3, lr}
@@ -425,13 +425,6 @@ sys_mmap2:
425#endif 425#endif
426ENDPROC(sys_mmap2) 426ENDPROC(sys_mmap2)
427 427
428ENTRY(pabort_ifar)
429 mrc p15, 0, r0, cr6, cr0, 2
430ENTRY(pabort_noifar)
431 mov pc, lr
432ENDPROC(pabort_ifar)
433ENDPROC(pabort_noifar)
434
435#ifdef CONFIG_OABI_COMPAT 428#ifdef CONFIG_OABI_COMPAT
436 429
437/* 430/*
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 93ad576b2d74..885a7214418d 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -13,6 +13,7 @@
13 13
14#define ATAG_CORE 0x54410001 14#define ATAG_CORE 0x54410001
15#define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2) 15#define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2)
16#define ATAG_CORE_SIZE_EMPTY ((2*4) >> 2)
16 17
17 .align 2 18 .align 2
18 .type __switch_data, %object 19 .type __switch_data, %object
@@ -251,7 +252,8 @@ __vet_atags:
251 bne 1f 252 bne 1f
252 253
253 ldr r5, [r2, #0] @ is first tag ATAG_CORE? 254 ldr r5, [r2, #0] @ is first tag ATAG_CORE?
254 subs r5, r5, #ATAG_CORE_SIZE 255 cmp r5, #ATAG_CORE_SIZE
256 cmpne r5, #ATAG_CORE_SIZE_EMPTY
255 bne 1f 257 bne 1f
256 ldr r5, [r2, #4] 258 ldr r5, [r2, #4]
257 ldr r6, =ATAG_CORE 259 ldr r6, =ATAG_CORE
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index e0d32770bb3d..57162af53dc9 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -36,6 +36,7 @@
36#include <asm/tlbflush.h> 36#include <asm/tlbflush.h>
37#include <asm/ptrace.h> 37#include <asm/ptrace.h>
38#include <asm/localtimer.h> 38#include <asm/localtimer.h>
39#include <asm/smp_plat.h>
39 40
40/* 41/*
41 * as from 2.5, kernels no longer have an init_tasks structure 42 * as from 2.5, kernels no longer have an init_tasks structure
@@ -153,7 +154,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
153/* 154/*
154 * __cpu_disable runs on the processor to be shutdown. 155 * __cpu_disable runs on the processor to be shutdown.
155 */ 156 */
156int __cpuexit __cpu_disable(void) 157int __cpu_disable(void)
157{ 158{
158 unsigned int cpu = smp_processor_id(); 159 unsigned int cpu = smp_processor_id();
159 struct task_struct *p; 160 struct task_struct *p;
@@ -200,7 +201,7 @@ int __cpuexit __cpu_disable(void)
200 * called on the thread which is asking for a CPU to be shutdown - 201 * called on the thread which is asking for a CPU to be shutdown -
201 * waits until shutdown has completed, or it is timed out. 202 * waits until shutdown has completed, or it is timed out.
202 */ 203 */
203void __cpuexit __cpu_die(unsigned int cpu) 204void __cpu_die(unsigned int cpu)
204{ 205{
205 if (!platform_cpu_kill(cpu)) 206 if (!platform_cpu_kill(cpu))
206 printk("CPU%u: unable to kill\n", cpu); 207 printk("CPU%u: unable to kill\n", cpu);
@@ -214,7 +215,7 @@ void __cpuexit __cpu_die(unsigned int cpu)
214 * of the other hotplug-cpu capable cores, so presumably coming 215 * of the other hotplug-cpu capable cores, so presumably coming
215 * out of idle fixes this. 216 * out of idle fixes this.
216 */ 217 */
217void __cpuexit cpu_die(void) 218void __ref cpu_die(void)
218{ 219{
219 unsigned int cpu = smp_processor_id(); 220 unsigned int cpu = smp_processor_id();
220 221
@@ -586,12 +587,6 @@ struct tlb_args {
586 unsigned long ta_end; 587 unsigned long ta_end;
587}; 588};
588 589
589/* all SMP configurations have the extended CPUID registers */
590static inline int tlb_ops_need_broadcast(void)
591{
592 return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 2;
593}
594
595static inline void ipi_flush_tlb_all(void *ignored) 590static inline void ipi_flush_tlb_all(void *ignored)
596{ 591{
597 local_flush_tlb_all(); 592 local_flush_tlb_all();
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index d8c88c633c6f..a73a34dccf2a 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -166,10 +166,12 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk)
166 clockevents_register_device(clk); 166 clockevents_register_device(clk);
167} 167}
168 168
169#ifdef CONFIG_HOTPLUG_CPU
169/* 170/*
170 * take a local timer down 171 * take a local timer down
171 */ 172 */
172void __cpuexit twd_timer_stop(void) 173void twd_timer_stop(void)
173{ 174{
174 __raw_writel(0, twd_base + TWD_TIMER_CONTROL); 175 __raw_writel(0, twd_base + TWD_TIMER_CONTROL);
175} 176}
177#endif
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 57eb0f6f6005..467b69ed1021 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -418,12 +418,14 @@ static int bad_syscall(int n, struct pt_regs *regs)
418static inline void 418static inline void
419do_cache_op(unsigned long start, unsigned long end, int flags) 419do_cache_op(unsigned long start, unsigned long end, int flags)
420{ 420{
421 struct mm_struct *mm = current->active_mm;
421 struct vm_area_struct *vma; 422 struct vm_area_struct *vma;
422 423
423 if (end < start || flags) 424 if (end < start || flags)
424 return; 425 return;
425 426
426 vma = find_vma(current->active_mm, start); 427 down_read(&mm->mmap_sem);
428 vma = find_vma(mm, start);
427 if (vma && vma->vm_start < end) { 429 if (vma && vma->vm_start < end) {
428 if (start < vma->vm_start) 430 if (start < vma->vm_start)
429 start = vma->vm_start; 431 start = vma->vm_start;
@@ -432,6 +434,7 @@ do_cache_op(unsigned long start, unsigned long end, int flags)
432 434
433 flush_cache_user_range(vma, start, end); 435 flush_cache_user_range(vma, start, end);
434 } 436 }
437 up_read(&mm->mmap_sem);
435} 438}
436 439
437/* 440/*
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 492c649f451e..4b4f69251b31 100644
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
@@ -31,7 +31,6 @@
31#include <linux/clocksource.h> 31#include <linux/clocksource.h>
32#include <linux/clockchips.h> 32#include <linux/clockchips.h>
33 33
34#include <linux/amba/bus.h>
35#include <mach/csp/mm_addr.h> 34#include <mach/csp/mm_addr.h>
36#include <mach/hardware.h> 35#include <mach/hardware.h>
37#include <asm/clkdev.h> 36#include <asm/clkdev.h>
@@ -45,7 +44,6 @@
45#include <asm/mach/irq.h> 44#include <asm/mach/irq.h>
46#include <asm/mach/time.h> 45#include <asm/mach/time.h>
47#include <asm/mach/map.h> 46#include <asm/mach/map.h>
48#include <asm/mach/mmc.h>
49 47
50#include <cfg_global.h> 48#include <cfg_global.h>
51 49
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index a1d5e7dac741..52dd8046b305 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -35,7 +35,6 @@
35#include <mach/common.h> 35#include <mach/common.h>
36#include <mach/i2c.h> 36#include <mach/i2c.h>
37#include <mach/serial.h> 37#include <mach/serial.h>
38#include <mach/common.h>
39#include <mach/mmc.h> 38#include <mach/mmc.h>
40#include <mach/nand.h> 39#include <mach/nand.h>
41 40
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c
index f1d72b225450..901cc205015e 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -486,7 +486,7 @@ int __init pci_v3_setup(int nr, struct pci_sys_data *sys)
486 return ret; 486 return ret;
487} 487}
488 488
489struct pci_bus *pci_v3_scan_bus(int nr, struct pci_sys_data *sys) 489struct pci_bus * __init pci_v3_scan_bus(int nr, struct pci_sys_data *sys)
490{ 490{
491 return pci_scan_bus(sys->busnr, &pci_v3_ops, sys); 491 return pci_scan_bus(sys->busnr, &pci_v3_ops, sys);
492} 492}
diff --git a/arch/arm/mach-iop32x/include/mach/iop32x.h b/arch/arm/mach-iop32x/include/mach/iop32x.h
index abd9eb49f103..941f363aca56 100644
--- a/arch/arm/mach-iop32x/include/mach/iop32x.h
+++ b/arch/arm/mach-iop32x/include/mach/iop32x.h
@@ -31,7 +31,5 @@
31#define IOP32X_MAX_RAM_SIZE 0x40000000UL 31#define IOP32X_MAX_RAM_SIZE 0x40000000UL
32#define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE 32#define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE
33#define IOP3XX_PCI_LOWER_MEM_BA 0x80000000 33#define IOP3XX_PCI_LOWER_MEM_BA 0x80000000
34#define IOP32X_PCI_MEM_WINDOW_SIZE 0x04000000
35#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP32X_PCI_MEM_WINDOW_SIZE
36 34
37#endif 35#endif
diff --git a/arch/arm/mach-iop33x/include/mach/iop33x.h b/arch/arm/mach-iop33x/include/mach/iop33x.h
index 24567316ec88..a89c0a234bff 100644
--- a/arch/arm/mach-iop33x/include/mach/iop33x.h
+++ b/arch/arm/mach-iop33x/include/mach/iop33x.h
@@ -36,8 +36,6 @@
36#define IOP33X_MAX_RAM_SIZE 0x80000000UL 36#define IOP33X_MAX_RAM_SIZE 0x80000000UL
37#define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE 37#define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE
38#define IOP3XX_PCI_LOWER_MEM_BA (PHYS_OFFSET + IOP33X_MAX_RAM_SIZE) 38#define IOP3XX_PCI_LOWER_MEM_BA (PHYS_OFFSET + IOP33X_MAX_RAM_SIZE)
39#define IOP33X_PCI_MEM_WINDOW_SIZE 0x08000000
40#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP33X_PCI_MEM_WINDOW_SIZE
41 39
42 40
43#endif 41#endif
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 81ffff7ed498..4e5c07f4e456 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -71,11 +71,6 @@ config SA1100_H3600
71 <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600> 71 <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600>
72 <http://www.compaq.com/products/handhelds/pocketpc/> 72 <http://www.compaq.com/products/handhelds/pocketpc/>
73 73
74config SA1100_H3XXX
75 bool
76 depends on SA1100_H3100 || SA1100_H3600
77 default y
78
79config SA1100_BADGE4 74config SA1100_BADGE4
80 bool "HP Labs BadgePAD 4" 75 bool "HP Labs BadgePAD 4"
81 select SA1111 76 select SA1111
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 95d92e8e56a8..b9cbb56d6e9d 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -77,7 +77,7 @@ static struct clock_event_device ckevt_sa1100_osmr0 = {
77 .set_mode = sa1100_osmr0_set_mode, 77 .set_mode = sa1100_osmr0_set_mode,
78}; 78};
79 79
80static cycle_t sa1100_read_oscr(void) 80static cycle_t sa1100_read_oscr(struct clocksource *s)
81{ 81{
82 return OSCR; 82 return OSCR;
83} 83}
diff --git a/arch/arm/mach-u300/gpio.c b/arch/arm/mach-u300/gpio.c
index 63c8f27fb15a..0b35826b7d1d 100644
--- a/arch/arm/mach-u300/gpio.c
+++ b/arch/arm/mach-u300/gpio.c
@@ -281,6 +281,16 @@ int gpio_unregister_callback(unsigned gpio)
281} 281}
282EXPORT_SYMBOL(gpio_unregister_callback); 282EXPORT_SYMBOL(gpio_unregister_callback);
283 283
284/* Non-zero means valid */
285int gpio_is_valid(int number)
286{
287 if (number >= 0 &&
288 number < (U300_GPIO_NUM_PORTS * U300_GPIO_PINS_PER_PORT))
289 return 1;
290 return 0;
291}
292EXPORT_SYMBOL(gpio_is_valid);
293
284int gpio_request(unsigned gpio, const char *label) 294int gpio_request(unsigned gpio, const char *label)
285{ 295{
286 if (gpio_pin[gpio].users) 296 if (gpio_pin[gpio].users)
diff --git a/arch/arm/mach-u300/include/mach/gpio.h b/arch/arm/mach-u300/include/mach/gpio.h
index c8174128d7eb..7b1fc984abb6 100644
--- a/arch/arm/mach-u300/include/mach/gpio.h
+++ b/arch/arm/mach-u300/include/mach/gpio.h
@@ -258,6 +258,7 @@
258#define PIN_TO_PORT(val) (val >> 3) 258#define PIN_TO_PORT(val) (val >> 3)
259 259
260/* These can be found in arch/arm/mach-u300/gpio.c */ 260/* These can be found in arch/arm/mach-u300/gpio.c */
261extern int gpio_is_valid(int number);
261extern int gpio_request(unsigned gpio, const char *label); 262extern int gpio_request(unsigned gpio, const char *label);
262extern void gpio_free(unsigned gpio); 263extern void gpio_free(unsigned gpio);
263extern int gpio_direction_input(unsigned gpio); 264extern int gpio_direction_input(unsigned gpio);
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 8d43e58f9244..e993140edd88 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -17,7 +17,7 @@ config CPU_ARM610
17 select CPU_CP15_MMU 17 select CPU_CP15_MMU
18 select CPU_COPY_V3 if MMU 18 select CPU_COPY_V3 if MMU
19 select CPU_TLB_V3 if MMU 19 select CPU_TLB_V3 if MMU
20 select CPU_PABRT_NOIFAR 20 select CPU_PABRT_LEGACY
21 help 21 help
22 The ARM610 is the successor to the ARM3 processor 22 The ARM610 is the successor to the ARM3 processor
23 and was produced by VLSI Technology Inc. 23 and was produced by VLSI Technology Inc.
@@ -31,7 +31,7 @@ config CPU_ARM7TDMI
31 depends on !MMU 31 depends on !MMU
32 select CPU_32v4T 32 select CPU_32v4T
33 select CPU_ABRT_LV4T 33 select CPU_ABRT_LV4T
34 select CPU_PABRT_NOIFAR 34 select CPU_PABRT_LEGACY
35 select CPU_CACHE_V4 35 select CPU_CACHE_V4
36 help 36 help
37 A 32-bit RISC microprocessor based on the ARM7 processor core 37 A 32-bit RISC microprocessor based on the ARM7 processor core
@@ -49,7 +49,7 @@ config CPU_ARM710
49 select CPU_CP15_MMU 49 select CPU_CP15_MMU
50 select CPU_COPY_V3 if MMU 50 select CPU_COPY_V3 if MMU
51 select CPU_TLB_V3 if MMU 51 select CPU_TLB_V3 if MMU
52 select CPU_PABRT_NOIFAR 52 select CPU_PABRT_LEGACY
53 help 53 help
54 A 32-bit RISC microprocessor based on the ARM7 processor core 54 A 32-bit RISC microprocessor based on the ARM7 processor core
55 designed by Advanced RISC Machines Ltd. The ARM710 is the 55 designed by Advanced RISC Machines Ltd. The ARM710 is the
@@ -64,7 +64,7 @@ config CPU_ARM720T
64 bool "Support ARM720T processor" if ARCH_INTEGRATOR 64 bool "Support ARM720T processor" if ARCH_INTEGRATOR
65 select CPU_32v4T 65 select CPU_32v4T
66 select CPU_ABRT_LV4T 66 select CPU_ABRT_LV4T
67 select CPU_PABRT_NOIFAR 67 select CPU_PABRT_LEGACY
68 select CPU_CACHE_V4 68 select CPU_CACHE_V4
69 select CPU_CACHE_VIVT 69 select CPU_CACHE_VIVT
70 select CPU_CP15_MMU 70 select CPU_CP15_MMU
@@ -83,7 +83,7 @@ config CPU_ARM740T
83 depends on !MMU 83 depends on !MMU
84 select CPU_32v4T 84 select CPU_32v4T
85 select CPU_ABRT_LV4T 85 select CPU_ABRT_LV4T
86 select CPU_PABRT_NOIFAR 86 select CPU_PABRT_LEGACY
87 select CPU_CACHE_V3 # although the core is v4t 87 select CPU_CACHE_V3 # although the core is v4t
88 select CPU_CP15_MPU 88 select CPU_CP15_MPU
89 help 89 help
@@ -100,7 +100,7 @@ config CPU_ARM9TDMI
100 depends on !MMU 100 depends on !MMU
101 select CPU_32v4T 101 select CPU_32v4T
102 select CPU_ABRT_NOMMU 102 select CPU_ABRT_NOMMU
103 select CPU_PABRT_NOIFAR 103 select CPU_PABRT_LEGACY
104 select CPU_CACHE_V4 104 select CPU_CACHE_V4
105 help 105 help
106 A 32-bit RISC microprocessor based on the ARM9 processor core 106 A 32-bit RISC microprocessor based on the ARM9 processor core
@@ -114,7 +114,7 @@ config CPU_ARM920T
114 bool "Support ARM920T processor" if ARCH_INTEGRATOR 114 bool "Support ARM920T processor" if ARCH_INTEGRATOR
115 select CPU_32v4T 115 select CPU_32v4T
116 select CPU_ABRT_EV4T 116 select CPU_ABRT_EV4T
117 select CPU_PABRT_NOIFAR 117 select CPU_PABRT_LEGACY
118 select CPU_CACHE_V4WT 118 select CPU_CACHE_V4WT
119 select CPU_CACHE_VIVT 119 select CPU_CACHE_VIVT
120 select CPU_CP15_MMU 120 select CPU_CP15_MMU
@@ -135,7 +135,7 @@ config CPU_ARM922T
135 bool "Support ARM922T processor" if ARCH_INTEGRATOR 135 bool "Support ARM922T processor" if ARCH_INTEGRATOR
136 select CPU_32v4T 136 select CPU_32v4T
137 select CPU_ABRT_EV4T 137 select CPU_ABRT_EV4T
138 select CPU_PABRT_NOIFAR 138 select CPU_PABRT_LEGACY
139 select CPU_CACHE_V4WT 139 select CPU_CACHE_V4WT
140 select CPU_CACHE_VIVT 140 select CPU_CACHE_VIVT
141 select CPU_CP15_MMU 141 select CPU_CP15_MMU
@@ -154,7 +154,7 @@ config CPU_ARM925T
154 bool "Support ARM925T processor" if ARCH_OMAP1 154 bool "Support ARM925T processor" if ARCH_OMAP1
155 select CPU_32v4T 155 select CPU_32v4T
156 select CPU_ABRT_EV4T 156 select CPU_ABRT_EV4T
157 select CPU_PABRT_NOIFAR 157 select CPU_PABRT_LEGACY
158 select CPU_CACHE_V4WT 158 select CPU_CACHE_V4WT
159 select CPU_CACHE_VIVT 159 select CPU_CACHE_VIVT
160 select CPU_CP15_MMU 160 select CPU_CP15_MMU
@@ -173,7 +173,7 @@ config CPU_ARM926T
173 bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB 173 bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB
174 select CPU_32v5 174 select CPU_32v5
175 select CPU_ABRT_EV5TJ 175 select CPU_ABRT_EV5TJ
176 select CPU_PABRT_NOIFAR 176 select CPU_PABRT_LEGACY
177 select CPU_CACHE_VIVT 177 select CPU_CACHE_VIVT
178 select CPU_CP15_MMU 178 select CPU_CP15_MMU
179 select CPU_COPY_V4WB if MMU 179 select CPU_COPY_V4WB if MMU
@@ -191,7 +191,7 @@ config CPU_FA526
191 bool 191 bool
192 select CPU_32v4 192 select CPU_32v4
193 select CPU_ABRT_EV4 193 select CPU_ABRT_EV4
194 select CPU_PABRT_NOIFAR 194 select CPU_PABRT_LEGACY
195 select CPU_CACHE_VIVT 195 select CPU_CACHE_VIVT
196 select CPU_CP15_MMU 196 select CPU_CP15_MMU
197 select CPU_CACHE_FA 197 select CPU_CACHE_FA
@@ -210,7 +210,7 @@ config CPU_ARM940T
210 depends on !MMU 210 depends on !MMU
211 select CPU_32v4T 211 select CPU_32v4T
212 select CPU_ABRT_NOMMU 212 select CPU_ABRT_NOMMU
213 select CPU_PABRT_NOIFAR 213 select CPU_PABRT_LEGACY
214 select CPU_CACHE_VIVT 214 select CPU_CACHE_VIVT
215 select CPU_CP15_MPU 215 select CPU_CP15_MPU
216 help 216 help
@@ -228,7 +228,7 @@ config CPU_ARM946E
228 depends on !MMU 228 depends on !MMU
229 select CPU_32v5 229 select CPU_32v5
230 select CPU_ABRT_NOMMU 230 select CPU_ABRT_NOMMU
231 select CPU_PABRT_NOIFAR 231 select CPU_PABRT_LEGACY
232 select CPU_CACHE_VIVT 232 select CPU_CACHE_VIVT
233 select CPU_CP15_MPU 233 select CPU_CP15_MPU
234 help 234 help
@@ -244,7 +244,7 @@ config CPU_ARM1020
244 bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR 244 bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR
245 select CPU_32v5 245 select CPU_32v5
246 select CPU_ABRT_EV4T 246 select CPU_ABRT_EV4T
247 select CPU_PABRT_NOIFAR 247 select CPU_PABRT_LEGACY
248 select CPU_CACHE_V4WT 248 select CPU_CACHE_V4WT
249 select CPU_CACHE_VIVT 249 select CPU_CACHE_VIVT
250 select CPU_CP15_MMU 250 select CPU_CP15_MMU
@@ -262,7 +262,7 @@ config CPU_ARM1020E
262 bool "Support ARM1020E processor" if ARCH_INTEGRATOR 262 bool "Support ARM1020E processor" if ARCH_INTEGRATOR
263 select CPU_32v5 263 select CPU_32v5
264 select CPU_ABRT_EV4T 264 select CPU_ABRT_EV4T
265 select CPU_PABRT_NOIFAR 265 select CPU_PABRT_LEGACY
266 select CPU_CACHE_V4WT 266 select CPU_CACHE_V4WT
267 select CPU_CACHE_VIVT 267 select CPU_CACHE_VIVT
268 select CPU_CP15_MMU 268 select CPU_CP15_MMU
@@ -275,7 +275,7 @@ config CPU_ARM1022
275 bool "Support ARM1022E processor" if ARCH_INTEGRATOR 275 bool "Support ARM1022E processor" if ARCH_INTEGRATOR
276 select CPU_32v5 276 select CPU_32v5
277 select CPU_ABRT_EV4T 277 select CPU_ABRT_EV4T
278 select CPU_PABRT_NOIFAR 278 select CPU_PABRT_LEGACY
279 select CPU_CACHE_VIVT 279 select CPU_CACHE_VIVT
280 select CPU_CP15_MMU 280 select CPU_CP15_MMU
281 select CPU_COPY_V4WB if MMU # can probably do better 281 select CPU_COPY_V4WB if MMU # can probably do better
@@ -293,7 +293,7 @@ config CPU_ARM1026
293 bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR 293 bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR
294 select CPU_32v5 294 select CPU_32v5
295 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 295 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10
296 select CPU_PABRT_NOIFAR 296 select CPU_PABRT_LEGACY
297 select CPU_CACHE_VIVT 297 select CPU_CACHE_VIVT
298 select CPU_CP15_MMU 298 select CPU_CP15_MMU
299 select CPU_COPY_V4WB if MMU # can probably do better 299 select CPU_COPY_V4WB if MMU # can probably do better
@@ -311,7 +311,7 @@ config CPU_SA110
311 select CPU_32v3 if ARCH_RPC 311 select CPU_32v3 if ARCH_RPC
312 select CPU_32v4 if !ARCH_RPC 312 select CPU_32v4 if !ARCH_RPC
313 select CPU_ABRT_EV4 313 select CPU_ABRT_EV4
314 select CPU_PABRT_NOIFAR 314 select CPU_PABRT_LEGACY
315 select CPU_CACHE_V4WB 315 select CPU_CACHE_V4WB
316 select CPU_CACHE_VIVT 316 select CPU_CACHE_VIVT
317 select CPU_CP15_MMU 317 select CPU_CP15_MMU
@@ -331,7 +331,7 @@ config CPU_SA1100
331 bool 331 bool
332 select CPU_32v4 332 select CPU_32v4
333 select CPU_ABRT_EV4 333 select CPU_ABRT_EV4
334 select CPU_PABRT_NOIFAR 334 select CPU_PABRT_LEGACY
335 select CPU_CACHE_V4WB 335 select CPU_CACHE_V4WB
336 select CPU_CACHE_VIVT 336 select CPU_CACHE_VIVT
337 select CPU_CP15_MMU 337 select CPU_CP15_MMU
@@ -342,7 +342,7 @@ config CPU_XSCALE
342 bool 342 bool
343 select CPU_32v5 343 select CPU_32v5
344 select CPU_ABRT_EV5T 344 select CPU_ABRT_EV5T
345 select CPU_PABRT_NOIFAR 345 select CPU_PABRT_LEGACY
346 select CPU_CACHE_VIVT 346 select CPU_CACHE_VIVT
347 select CPU_CP15_MMU 347 select CPU_CP15_MMU
348 select CPU_TLB_V4WBI if MMU 348 select CPU_TLB_V4WBI if MMU
@@ -352,7 +352,7 @@ config CPU_XSC3
352 bool 352 bool
353 select CPU_32v5 353 select CPU_32v5
354 select CPU_ABRT_EV5T 354 select CPU_ABRT_EV5T
355 select CPU_PABRT_NOIFAR 355 select CPU_PABRT_LEGACY
356 select CPU_CACHE_VIVT 356 select CPU_CACHE_VIVT
357 select CPU_CP15_MMU 357 select CPU_CP15_MMU
358 select CPU_TLB_V4WBI if MMU 358 select CPU_TLB_V4WBI if MMU
@@ -363,7 +363,7 @@ config CPU_MOHAWK
363 bool 363 bool
364 select CPU_32v5 364 select CPU_32v5
365 select CPU_ABRT_EV5T 365 select CPU_ABRT_EV5T
366 select CPU_PABRT_NOIFAR 366 select CPU_PABRT_LEGACY
367 select CPU_CACHE_VIVT 367 select CPU_CACHE_VIVT
368 select CPU_CP15_MMU 368 select CPU_CP15_MMU
369 select CPU_TLB_V4WBI if MMU 369 select CPU_TLB_V4WBI if MMU
@@ -374,7 +374,7 @@ config CPU_FEROCEON
374 bool 374 bool
375 select CPU_32v5 375 select CPU_32v5
376 select CPU_ABRT_EV5T 376 select CPU_ABRT_EV5T
377 select CPU_PABRT_NOIFAR 377 select CPU_PABRT_LEGACY
378 select CPU_CACHE_VIVT 378 select CPU_CACHE_VIVT
379 select CPU_CP15_MMU 379 select CPU_CP15_MMU
380 select CPU_COPY_FEROCEON if MMU 380 select CPU_COPY_FEROCEON if MMU
@@ -394,7 +394,7 @@ config CPU_V6
394 bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX 394 bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX
395 select CPU_32v6 395 select CPU_32v6
396 select CPU_ABRT_EV6 396 select CPU_ABRT_EV6
397 select CPU_PABRT_NOIFAR 397 select CPU_PABRT_V6
398 select CPU_CACHE_V6 398 select CPU_CACHE_V6
399 select CPU_CACHE_VIPT 399 select CPU_CACHE_VIPT
400 select CPU_CP15_MMU 400 select CPU_CP15_MMU
@@ -420,7 +420,7 @@ config CPU_V7
420 select CPU_32v6K 420 select CPU_32v6K
421 select CPU_32v7 421 select CPU_32v7
422 select CPU_ABRT_EV7 422 select CPU_ABRT_EV7
423 select CPU_PABRT_IFAR 423 select CPU_PABRT_V7
424 select CPU_CACHE_V7 424 select CPU_CACHE_V7
425 select CPU_CACHE_VIPT 425 select CPU_CACHE_VIPT
426 select CPU_CP15_MMU 426 select CPU_CP15_MMU
@@ -482,10 +482,13 @@ config CPU_ABRT_EV6
482config CPU_ABRT_EV7 482config CPU_ABRT_EV7
483 bool 483 bool
484 484
485config CPU_PABRT_IFAR 485config CPU_PABRT_LEGACY
486 bool 486 bool
487 487
488config CPU_PABRT_NOIFAR 488config CPU_PABRT_V6
489 bool
490
491config CPU_PABRT_V7
489 bool 492 bool
490 493
491# The cache model 494# The cache model
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 63e3f6dd0e21..055cb2aa8134 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -27,6 +27,10 @@ obj-$(CONFIG_CPU_ABRT_EV5TJ) += abort-ev5tj.o
27obj-$(CONFIG_CPU_ABRT_EV6) += abort-ev6.o 27obj-$(CONFIG_CPU_ABRT_EV6) += abort-ev6.o
28obj-$(CONFIG_CPU_ABRT_EV7) += abort-ev7.o 28obj-$(CONFIG_CPU_ABRT_EV7) += abort-ev7.o
29 29
30obj-$(CONFIG_CPU_PABRT_LEGACY) += pabort-legacy.o
31obj-$(CONFIG_CPU_PABRT_V6) += pabort-v6.o
32obj-$(CONFIG_CPU_PABRT_V7) += pabort-v7.o
33
30obj-$(CONFIG_CPU_CACHE_V3) += cache-v3.o 34obj-$(CONFIG_CPU_CACHE_V3) += cache-v3.o
31obj-$(CONFIG_CPU_CACHE_V4) += cache-v4.o 35obj-$(CONFIG_CPU_CACHE_V4) += cache-v4.o
32obj-$(CONFIG_CPU_CACHE_V4WT) += cache-v4wt.o 36obj-$(CONFIG_CPU_CACHE_V4WT) += cache-v4wt.o
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 379f78556055..ae0e25f5a70e 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -519,9 +519,58 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
519 arm_notify_die("", regs, &info, fsr, 0); 519 arm_notify_die("", regs, &info, fsr, 0);
520} 520}
521 521
522
523static struct fsr_info ifsr_info[] = {
524 { do_bad, SIGBUS, 0, "unknown 0" },
525 { do_bad, SIGBUS, 0, "unknown 1" },
526 { do_bad, SIGBUS, 0, "debug event" },
527 { do_bad, SIGSEGV, SEGV_ACCERR, "section access flag fault" },
528 { do_bad, SIGBUS, 0, "unknown 4" },
529 { do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation fault" },
530 { do_bad, SIGSEGV, SEGV_ACCERR, "page access flag fault" },
531 { do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },
532 { do_bad, SIGBUS, 0, "external abort on non-linefetch" },
533 { do_bad, SIGSEGV, SEGV_ACCERR, "section domain fault" },
534 { do_bad, SIGBUS, 0, "unknown 10" },
535 { do_bad, SIGSEGV, SEGV_ACCERR, "page domain fault" },
536 { do_bad, SIGBUS, 0, "external abort on translation" },
537 { do_sect_fault, SIGSEGV, SEGV_ACCERR, "section permission fault" },
538 { do_bad, SIGBUS, 0, "external abort on translation" },
539 { do_page_fault, SIGSEGV, SEGV_ACCERR, "page permission fault" },
540 { do_bad, SIGBUS, 0, "unknown 16" },
541 { do_bad, SIGBUS, 0, "unknown 17" },
542 { do_bad, SIGBUS, 0, "unknown 18" },
543 { do_bad, SIGBUS, 0, "unknown 19" },
544 { do_bad, SIGBUS, 0, "unknown 20" },
545 { do_bad, SIGBUS, 0, "unknown 21" },
546 { do_bad, SIGBUS, 0, "unknown 22" },
547 { do_bad, SIGBUS, 0, "unknown 23" },
548 { do_bad, SIGBUS, 0, "unknown 24" },
549 { do_bad, SIGBUS, 0, "unknown 25" },
550 { do_bad, SIGBUS, 0, "unknown 26" },
551 { do_bad, SIGBUS, 0, "unknown 27" },
552 { do_bad, SIGBUS, 0, "unknown 28" },
553 { do_bad, SIGBUS, 0, "unknown 29" },
554 { do_bad, SIGBUS, 0, "unknown 30" },
555 { do_bad, SIGBUS, 0, "unknown 31" },
556};
557
522asmlinkage void __exception 558asmlinkage void __exception
523do_PrefetchAbort(unsigned long addr, struct pt_regs *regs) 559do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
524{ 560{
525 do_translation_fault(addr, FSR_LNX_PF, regs); 561 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
562 struct siginfo info;
563
564 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
565 return;
566
567 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
568 inf->name, ifsr, addr);
569
570 info.si_signo = inf->sig;
571 info.si_errno = 0;
572 info.si_code = inf->code;
573 info.si_addr = (void __user *)addr;
574 arm_notify_die("", regs, &info, ifsr, 0);
526} 575}
527 576
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
index f7457fea6de8..2b7996401b0f 100644
--- a/arch/arm/mm/mmap.c
+++ b/arch/arm/mm/mmap.c
@@ -124,7 +124,7 @@ int valid_phys_addr_range(unsigned long addr, size_t size)
124{ 124{
125 if (addr < PHYS_OFFSET) 125 if (addr < PHYS_OFFSET)
126 return 0; 126 return 0;
127 if (addr + size >= __pa(high_memory - 1)) 127 if (addr + size > __pa(high_memory - 1) + 1)
128 return 0; 128 return 0;
129 129
130 return 1; 130 return 1;
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 4426ee67ceca..02243eeccf50 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -21,6 +21,7 @@
21#include <asm/cachetype.h> 21#include <asm/cachetype.h>
22#include <asm/setup.h> 22#include <asm/setup.h>
23#include <asm/sizes.h> 23#include <asm/sizes.h>
24#include <asm/smp_plat.h>
24#include <asm/tlb.h> 25#include <asm/tlb.h>
25#include <asm/highmem.h> 26#include <asm/highmem.h>
26 27
@@ -709,10 +710,6 @@ static void __init sanity_check_meminfo(void)
709 if (meminfo.nr_banks >= NR_BANKS) { 710 if (meminfo.nr_banks >= NR_BANKS) {
710 printk(KERN_CRIT "NR_BANKS too low, " 711 printk(KERN_CRIT "NR_BANKS too low, "
711 "ignoring high memory\n"); 712 "ignoring high memory\n");
712 } else if (cache_is_vipt_aliasing()) {
713 printk(KERN_CRIT "HIGHMEM is not yet supported "
714 "with VIPT aliasing cache, "
715 "ignoring high memory\n");
716 } else { 713 } else {
717 memmove(bank + 1, bank, 714 memmove(bank + 1, bank,
718 (meminfo.nr_banks - i) * sizeof(*bank)); 715 (meminfo.nr_banks - i) * sizeof(*bank));
@@ -726,6 +723,8 @@ static void __init sanity_check_meminfo(void)
726 bank->size = VMALLOC_MIN - __va(bank->start); 723 bank->size = VMALLOC_MIN - __va(bank->start);
727 } 724 }
728#else 725#else
726 bank->highmem = highmem;
727
729 /* 728 /*
730 * Check whether this memory bank would entirely overlap 729 * Check whether this memory bank would entirely overlap
731 * the vmalloc area. 730 * the vmalloc area.
@@ -754,6 +753,38 @@ static void __init sanity_check_meminfo(void)
754#endif 753#endif
755 j++; 754 j++;
756 } 755 }
756#ifdef CONFIG_HIGHMEM
757 if (highmem) {
758 const char *reason = NULL;
759
760 if (cache_is_vipt_aliasing()) {
761 /*
762 * Interactions between kmap and other mappings
763 * make highmem support with aliasing VIPT caches
764 * rather difficult.
765 */
766 reason = "with VIPT aliasing cache";
767#ifdef CONFIG_SMP
768 } else if (tlb_ops_need_broadcast()) {
769 /*
770 * kmap_high needs to occasionally flush TLB entries,
771 * however, if the TLB entries need to be broadcast
772 * we may deadlock:
773 * kmap_high(irqs off)->flush_all_zero_pkmaps->
774 * flush_tlb_kernel_range->smp_call_function_many
775 * (must not be called with irqs off)
776 */
777 reason = "without hardware TLB ops broadcasting";
778#endif
779 }
780 if (reason) {
781 printk(KERN_CRIT "HIGHMEM is not supported %s, ignoring high memory\n",
782 reason);
783 while (j > 0 && meminfo.bank[j - 1].highmem)
784 j--;
785 }
786 }
787#endif
757 meminfo.nr_banks = j; 788 meminfo.nr_banks = j;
758} 789}
759 790
diff --git a/arch/arm/mm/pabort-legacy.S b/arch/arm/mm/pabort-legacy.S
new file mode 100644
index 000000000000..87970eba88ea
--- /dev/null
+++ b/arch/arm/mm/pabort-legacy.S
@@ -0,0 +1,19 @@
1#include <linux/linkage.h>
2#include <asm/assembler.h>
3
4/*
5 * Function: legacy_pabort
6 *
7 * Params : r0 = address of aborted instruction
8 *
9 * Returns : r0 = address of abort
10 * : r1 = Simulated IFSR with section translation fault status
11 *
12 * Purpose : obtain information about current prefetch abort.
13 */
14
15 .align 5
16ENTRY(legacy_pabort)
17 mov r1, #5
18 mov pc, lr
19ENDPROC(legacy_pabort)
diff --git a/arch/arm/mm/pabort-v6.S b/arch/arm/mm/pabort-v6.S
new file mode 100644
index 000000000000..06e3d1ef2115
--- /dev/null
+++ b/arch/arm/mm/pabort-v6.S
@@ -0,0 +1,19 @@
1#include <linux/linkage.h>
2#include <asm/assembler.h>
3
4/*
5 * Function: v6_pabort
6 *
7 * Params : r0 = address of aborted instruction
8 *
9 * Returns : r0 = address of abort
10 * : r1 = IFSR
11 *
12 * Purpose : obtain information about current prefetch abort.
13 */
14
15 .align 5
16ENTRY(v6_pabort)
17 mrc p15, 0, r1, c5, c0, 1 @ get IFSR
18 mov pc, lr
19ENDPROC(v6_pabort)
diff --git a/arch/arm/mm/pabort-v7.S b/arch/arm/mm/pabort-v7.S
new file mode 100644
index 000000000000..a8b3b300a18d
--- /dev/null
+++ b/arch/arm/mm/pabort-v7.S
@@ -0,0 +1,20 @@
1#include <linux/linkage.h>
2#include <asm/assembler.h>
3
4/*
5 * Function: v6_pabort
6 *
7 * Params : r0 = address of aborted instruction
8 *
9 * Returns : r0 = address of abort
10 * : r1 = IFSR
11 *
12 * Purpose : obtain information about current prefetch abort.
13 */
14
15 .align 5
16ENTRY(v7_pabort)
17 mrc p15, 0, r0, c6, c0, 2 @ get IFAR
18 mrc p15, 0, r1, c5, c0, 1 @ get IFSR
19 mov pc, lr
20ENDPROC(v7_pabort)
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index b5551bf010aa..d9fb4b98c49f 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -449,7 +449,7 @@ arm1020_crval:
449 .type arm1020_processor_functions, #object 449 .type arm1020_processor_functions, #object
450arm1020_processor_functions: 450arm1020_processor_functions:
451 .word v4t_early_abort 451 .word v4t_early_abort
452 .word pabort_noifar 452 .word legacy_pabort
453 .word cpu_arm1020_proc_init 453 .word cpu_arm1020_proc_init
454 .word cpu_arm1020_proc_fin 454 .word cpu_arm1020_proc_fin
455 .word cpu_arm1020_reset 455 .word cpu_arm1020_reset
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index 8bc6740c29eb..7453b75dcea5 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -430,7 +430,7 @@ arm1020e_crval:
430 .type arm1020e_processor_functions, #object 430 .type arm1020e_processor_functions, #object
431arm1020e_processor_functions: 431arm1020e_processor_functions:
432 .word v4t_early_abort 432 .word v4t_early_abort
433 .word pabort_noifar 433 .word legacy_pabort
434 .word cpu_arm1020e_proc_init 434 .word cpu_arm1020e_proc_init
435 .word cpu_arm1020e_proc_fin 435 .word cpu_arm1020e_proc_fin
436 .word cpu_arm1020e_reset 436 .word cpu_arm1020e_reset
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 2cd03e66c0a3..8eb72d75a8b6 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -413,7 +413,7 @@ arm1022_crval:
413 .type arm1022_processor_functions, #object 413 .type arm1022_processor_functions, #object
414arm1022_processor_functions: 414arm1022_processor_functions:
415 .word v4t_early_abort 415 .word v4t_early_abort
416 .word pabort_noifar 416 .word legacy_pabort
417 .word cpu_arm1022_proc_init 417 .word cpu_arm1022_proc_init
418 .word cpu_arm1022_proc_fin 418 .word cpu_arm1022_proc_fin
419 .word cpu_arm1022_reset 419 .word cpu_arm1022_reset
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index ad961a897f6e..3b59f0d67139 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -408,7 +408,7 @@ arm1026_crval:
408 .type arm1026_processor_functions, #object 408 .type arm1026_processor_functions, #object
409arm1026_processor_functions: 409arm1026_processor_functions:
410 .word v5t_early_abort 410 .word v5t_early_abort
411 .word pabort_noifar 411 .word legacy_pabort
412 .word cpu_arm1026_proc_init 412 .word cpu_arm1026_proc_init
413 .word cpu_arm1026_proc_fin 413 .word cpu_arm1026_proc_fin
414 .word cpu_arm1026_reset 414 .word cpu_arm1026_reset
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S
index 80d6e1de069a..3f9cd3d8f6d5 100644
--- a/arch/arm/mm/proc-arm6_7.S
+++ b/arch/arm/mm/proc-arm6_7.S
@@ -278,7 +278,7 @@ __arm7_setup: mov r0, #0
278 .type arm6_processor_functions, #object 278 .type arm6_processor_functions, #object
279ENTRY(arm6_processor_functions) 279ENTRY(arm6_processor_functions)
280 .word cpu_arm6_data_abort 280 .word cpu_arm6_data_abort
281 .word pabort_noifar 281 .word legacy_pabort
282 .word cpu_arm6_proc_init 282 .word cpu_arm6_proc_init
283 .word cpu_arm6_proc_fin 283 .word cpu_arm6_proc_fin
284 .word cpu_arm6_reset 284 .word cpu_arm6_reset
@@ -295,7 +295,7 @@ ENTRY(arm6_processor_functions)
295 .type arm7_processor_functions, #object 295 .type arm7_processor_functions, #object
296ENTRY(arm7_processor_functions) 296ENTRY(arm7_processor_functions)
297 .word cpu_arm7_data_abort 297 .word cpu_arm7_data_abort
298 .word pabort_noifar 298 .word legacy_pabort
299 .word cpu_arm7_proc_init 299 .word cpu_arm7_proc_init
300 .word cpu_arm7_proc_fin 300 .word cpu_arm7_proc_fin
301 .word cpu_arm7_reset 301 .word cpu_arm7_reset
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 85ae18695f10..0b62de244666 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -181,7 +181,7 @@ arm720_crval:
181 .type arm720_processor_functions, #object 181 .type arm720_processor_functions, #object
182ENTRY(arm720_processor_functions) 182ENTRY(arm720_processor_functions)
183 .word v4t_late_abort 183 .word v4t_late_abort
184 .word pabort_noifar 184 .word legacy_pabort
185 .word cpu_arm720_proc_init 185 .word cpu_arm720_proc_init
186 .word cpu_arm720_proc_fin 186 .word cpu_arm720_proc_fin
187 .word cpu_arm720_reset 187 .word cpu_arm720_reset
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S
index 4f95bee63e95..01860cdeb2ec 100644
--- a/arch/arm/mm/proc-arm740.S
+++ b/arch/arm/mm/proc-arm740.S
@@ -126,7 +126,7 @@ __arm740_setup:
126 .type arm740_processor_functions, #object 126 .type arm740_processor_functions, #object
127ENTRY(arm740_processor_functions) 127ENTRY(arm740_processor_functions)
128 .word v4t_late_abort 128 .word v4t_late_abort
129 .word pabort_noifar 129 .word legacy_pabort
130 .word cpu_arm740_proc_init 130 .word cpu_arm740_proc_init
131 .word cpu_arm740_proc_fin 131 .word cpu_arm740_proc_fin
132 .word cpu_arm740_reset 132 .word cpu_arm740_reset
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S
index 93e05fa7bed4..1201b9863829 100644
--- a/arch/arm/mm/proc-arm7tdmi.S
+++ b/arch/arm/mm/proc-arm7tdmi.S
@@ -64,7 +64,7 @@ __arm7tdmi_setup:
64 .type arm7tdmi_processor_functions, #object 64 .type arm7tdmi_processor_functions, #object
65ENTRY(arm7tdmi_processor_functions) 65ENTRY(arm7tdmi_processor_functions)
66 .word v4t_late_abort 66 .word v4t_late_abort
67 .word pabort_noifar 67 .word legacy_pabort
68 .word cpu_arm7tdmi_proc_init 68 .word cpu_arm7tdmi_proc_init
69 .word cpu_arm7tdmi_proc_fin 69 .word cpu_arm7tdmi_proc_fin
70 .word cpu_arm7tdmi_reset 70 .word cpu_arm7tdmi_reset
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S
index 914d688394fc..2b7c197cc58d 100644
--- a/arch/arm/mm/proc-arm920.S
+++ b/arch/arm/mm/proc-arm920.S
@@ -395,7 +395,7 @@ arm920_crval:
395 .type arm920_processor_functions, #object 395 .type arm920_processor_functions, #object
396arm920_processor_functions: 396arm920_processor_functions:
397 .word v4t_early_abort 397 .word v4t_early_abort
398 .word pabort_noifar 398 .word legacy_pabort
399 .word cpu_arm920_proc_init 399 .word cpu_arm920_proc_init
400 .word cpu_arm920_proc_fin 400 .word cpu_arm920_proc_fin
401 .word cpu_arm920_reset 401 .word cpu_arm920_reset
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S
index 51c9c9859e58..06a1aa4e3398 100644
--- a/arch/arm/mm/proc-arm922.S
+++ b/arch/arm/mm/proc-arm922.S
@@ -399,7 +399,7 @@ arm922_crval:
399 .type arm922_processor_functions, #object 399 .type arm922_processor_functions, #object
400arm922_processor_functions: 400arm922_processor_functions:
401 .word v4t_early_abort 401 .word v4t_early_abort
402 .word pabort_noifar 402 .word legacy_pabort
403 .word cpu_arm922_proc_init 403 .word cpu_arm922_proc_init
404 .word cpu_arm922_proc_fin 404 .word cpu_arm922_proc_fin
405 .word cpu_arm922_reset 405 .word cpu_arm922_reset
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S
index 2724526d89c1..cb53435a85ae 100644
--- a/arch/arm/mm/proc-arm925.S
+++ b/arch/arm/mm/proc-arm925.S
@@ -462,7 +462,7 @@ arm925_crval:
462 .type arm925_processor_functions, #object 462 .type arm925_processor_functions, #object
463arm925_processor_functions: 463arm925_processor_functions:
464 .word v4t_early_abort 464 .word v4t_early_abort
465 .word pabort_noifar 465 .word legacy_pabort
466 .word cpu_arm925_proc_init 466 .word cpu_arm925_proc_init
467 .word cpu_arm925_proc_fin 467 .word cpu_arm925_proc_fin
468 .word cpu_arm925_reset 468 .word cpu_arm925_reset
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S
index 54466937bff9..1c4848704bb3 100644
--- a/arch/arm/mm/proc-arm926.S
+++ b/arch/arm/mm/proc-arm926.S
@@ -415,7 +415,7 @@ arm926_crval:
415 .type arm926_processor_functions, #object 415 .type arm926_processor_functions, #object
416arm926_processor_functions: 416arm926_processor_functions:
417 .word v5tj_early_abort 417 .word v5tj_early_abort
418 .word pabort_noifar 418 .word legacy_pabort
419 .word cpu_arm926_proc_init 419 .word cpu_arm926_proc_init
420 .word cpu_arm926_proc_fin 420 .word cpu_arm926_proc_fin
421 .word cpu_arm926_reset 421 .word cpu_arm926_reset
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S
index f595117caf55..5b0f8464c8f2 100644
--- a/arch/arm/mm/proc-arm940.S
+++ b/arch/arm/mm/proc-arm940.S
@@ -322,7 +322,7 @@ __arm940_setup:
322 .type arm940_processor_functions, #object 322 .type arm940_processor_functions, #object
323ENTRY(arm940_processor_functions) 323ENTRY(arm940_processor_functions)
324 .word nommu_early_abort 324 .word nommu_early_abort
325 .word pabort_noifar 325 .word legacy_pabort
326 .word cpu_arm940_proc_init 326 .word cpu_arm940_proc_init
327 .word cpu_arm940_proc_fin 327 .word cpu_arm940_proc_fin
328 .word cpu_arm940_reset 328 .word cpu_arm940_reset
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S
index e03f6ff1fb26..40c0449a139b 100644
--- a/arch/arm/mm/proc-arm946.S
+++ b/arch/arm/mm/proc-arm946.S
@@ -377,7 +377,7 @@ __arm946_setup:
377 .type arm946_processor_functions, #object 377 .type arm946_processor_functions, #object
378ENTRY(arm946_processor_functions) 378ENTRY(arm946_processor_functions)
379 .word nommu_early_abort 379 .word nommu_early_abort
380 .word pabort_noifar 380 .word legacy_pabort
381 .word cpu_arm946_proc_init 381 .word cpu_arm946_proc_init
382 .word cpu_arm946_proc_fin 382 .word cpu_arm946_proc_fin
383 .word cpu_arm946_reset 383 .word cpu_arm946_reset
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S
index be6c11d2b3fb..28545c29dbcd 100644
--- a/arch/arm/mm/proc-arm9tdmi.S
+++ b/arch/arm/mm/proc-arm9tdmi.S
@@ -64,7 +64,7 @@ __arm9tdmi_setup:
64 .type arm9tdmi_processor_functions, #object 64 .type arm9tdmi_processor_functions, #object
65ENTRY(arm9tdmi_processor_functions) 65ENTRY(arm9tdmi_processor_functions)
66 .word nommu_early_abort 66 .word nommu_early_abort
67 .word pabort_noifar 67 .word legacy_pabort
68 .word cpu_arm9tdmi_proc_init 68 .word cpu_arm9tdmi_proc_init
69 .word cpu_arm9tdmi_proc_fin 69 .word cpu_arm9tdmi_proc_fin
70 .word cpu_arm9tdmi_reset 70 .word cpu_arm9tdmi_reset
diff --git a/arch/arm/mm/proc-fa526.S b/arch/arm/mm/proc-fa526.S
index 08b8a955d5d7..08f5ac237ad4 100644
--- a/arch/arm/mm/proc-fa526.S
+++ b/arch/arm/mm/proc-fa526.S
@@ -191,7 +191,7 @@ fa526_cr1_set:
191 .type fa526_processor_functions, #object 191 .type fa526_processor_functions, #object
192fa526_processor_functions: 192fa526_processor_functions:
193 .word v4_early_abort 193 .word v4_early_abort
194 .word pabort_noifar 194 .word legacy_pabort
195 .word cpu_fa526_proc_init 195 .word cpu_fa526_proc_init
196 .word cpu_fa526_proc_fin 196 .word cpu_fa526_proc_fin
197 .word cpu_fa526_reset 197 .word cpu_fa526_reset
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 0fe1f8fc3488..d0d7795200fc 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -499,7 +499,7 @@ feroceon_crval:
499 .type feroceon_processor_functions, #object 499 .type feroceon_processor_functions, #object
500feroceon_processor_functions: 500feroceon_processor_functions:
501 .word v5t_early_abort 501 .word v5t_early_abort
502 .word pabort_noifar 502 .word legacy_pabort
503 .word cpu_feroceon_proc_init 503 .word cpu_feroceon_proc_init
504 .word cpu_feroceon_proc_fin 504 .word cpu_feroceon_proc_fin
505 .word cpu_feroceon_reset 505 .word cpu_feroceon_reset
diff --git a/arch/arm/mm/proc-mohawk.S b/arch/arm/mm/proc-mohawk.S
index 540f5078496b..52b5fd74fbb3 100644
--- a/arch/arm/mm/proc-mohawk.S
+++ b/arch/arm/mm/proc-mohawk.S
@@ -359,7 +359,7 @@ mohawk_crval:
359 .type mohawk_processor_functions, #object 359 .type mohawk_processor_functions, #object
360mohawk_processor_functions: 360mohawk_processor_functions:
361 .word v5t_early_abort 361 .word v5t_early_abort
362 .word pabort_noifar 362 .word legacy_pabort
363 .word cpu_mohawk_proc_init 363 .word cpu_mohawk_proc_init
364 .word cpu_mohawk_proc_fin 364 .word cpu_mohawk_proc_fin
365 .word cpu_mohawk_reset 365 .word cpu_mohawk_reset
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 90a7e5279f29..7b706b389906 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -199,7 +199,7 @@ sa110_crval:
199 .type sa110_processor_functions, #object 199 .type sa110_processor_functions, #object
200ENTRY(sa110_processor_functions) 200ENTRY(sa110_processor_functions)
201 .word v4_early_abort 201 .word v4_early_abort
202 .word pabort_noifar 202 .word legacy_pabort
203 .word cpu_sa110_proc_init 203 .word cpu_sa110_proc_init
204 .word cpu_sa110_proc_fin 204 .word cpu_sa110_proc_fin
205 .word cpu_sa110_reset 205 .word cpu_sa110_reset
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index 451e2d953e2a..ee7700242c19 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -214,7 +214,7 @@ sa1100_crval:
214 .type sa1100_processor_functions, #object 214 .type sa1100_processor_functions, #object
215ENTRY(sa1100_processor_functions) 215ENTRY(sa1100_processor_functions)
216 .word v4_early_abort 216 .word v4_early_abort
217 .word pabort_noifar 217 .word legacy_pabort
218 .word cpu_sa1100_proc_init 218 .word cpu_sa1100_proc_init
219 .word cpu_sa1100_proc_fin 219 .word cpu_sa1100_proc_fin
220 .word cpu_sa1100_reset 220 .word cpu_sa1100_reset
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 524ddae92595..194737d60a22 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -191,7 +191,7 @@ v6_crval:
191 .type v6_processor_functions, #object 191 .type v6_processor_functions, #object
192ENTRY(v6_processor_functions) 192ENTRY(v6_processor_functions)
193 .word v6_early_abort 193 .word v6_early_abort
194 .word pabort_noifar 194 .word v6_pabort
195 .word cpu_v6_proc_init 195 .word cpu_v6_proc_init
196 .word cpu_v6_proc_fin 196 .word cpu_v6_proc_fin
197 .word cpu_v6_reset 197 .word cpu_v6_reset
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index f3fa1c32fe92..23ebcf6eab9f 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -295,7 +295,7 @@ __v7_setup_stack:
295 .type v7_processor_functions, #object 295 .type v7_processor_functions, #object
296ENTRY(v7_processor_functions) 296ENTRY(v7_processor_functions)
297 .word v7_early_abort 297 .word v7_early_abort
298 .word pabort_ifar 298 .word v7_pabort
299 .word cpu_v7_proc_init 299 .word cpu_v7_proc_init
300 .word cpu_v7_proc_fin 300 .word cpu_v7_proc_fin
301 .word cpu_v7_reset 301 .word cpu_v7_reset
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index 33515c214b92..2028f3702881 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -428,7 +428,7 @@ xsc3_crval:
428 .type xsc3_processor_functions, #object 428 .type xsc3_processor_functions, #object
429ENTRY(xsc3_processor_functions) 429ENTRY(xsc3_processor_functions)
430 .word v5t_early_abort 430 .word v5t_early_abort
431 .word pabort_noifar 431 .word legacy_pabort
432 .word cpu_xsc3_proc_init 432 .word cpu_xsc3_proc_init
433 .word cpu_xsc3_proc_fin 433 .word cpu_xsc3_proc_fin
434 .word cpu_xsc3_reset 434 .word cpu_xsc3_reset
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 423394260bcb..f056c283682d 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -511,7 +511,7 @@ xscale_crval:
511 .type xscale_processor_functions, #object 511 .type xscale_processor_functions, #object
512ENTRY(xscale_processor_functions) 512ENTRY(xscale_processor_functions)
513 .word v5t_early_abort 513 .word v5t_early_abort
514 .word pabort_noifar 514 .word legacy_pabort
515 .word cpu_xscale_proc_init 515 .word cpu_xscale_proc_init
516 .word cpu_xscale_proc_fin 516 .word cpu_xscale_proc_fin
517 .word cpu_xscale_reset 517 .word cpu_xscale_reset
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c
index 77fa7cc7d162..ce31f316ac75 100644
--- a/arch/arm/plat-iop/pci.c
+++ b/arch/arm/plat-iop/pci.c
@@ -257,7 +257,8 @@ void __init iop3xx_atu_setup(void)
257 *IOP3XX_OUMWTVR0 = 0; 257 *IOP3XX_OUMWTVR0 = 0;
258 258
259 /* Outbound window 1 */ 259 /* Outbound window 1 */
260 *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + IOP3XX_PCI_MEM_WINDOW_SIZE; 260 *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA +
261 IOP3XX_PCI_MEM_WINDOW_SIZE / 2;
261 *IOP3XX_OUMWTVR1 = 0; 262 *IOP3XX_OUMWTVR1 = 0;
262 263
263 /* BAR 3 ( Disabled ) */ 264 /* BAR 3 ( Disabled ) */
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
index 3695bbe3ee28..8da95d57c21f 100644
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@ -85,7 +85,7 @@ void __init iop_init_time(unsigned long tick_rate)
85{ 85{
86 u32 timer_ctl; 86 u32 timer_ctl;
87 87
88 ticks_per_jiffy = (tick_rate + HZ/2) / HZ; 88 ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ);
89 ticks_per_usec = tick_rate / 1000000; 89 ticks_per_usec = tick_rate / 1000000;
90 next_jiffy_time = 0xffffffff; 90 next_jiffy_time = 0xffffffff;
91 iop_tick_rate = tick_rate; 91 iop_tick_rate = tick_rate;
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 3d1e5329da12..705a5894a6bb 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -678,7 +678,6 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
678 writel(0, host->base + MMCIMASK1); 678 writel(0, host->base + MMCIMASK1);
679 writel(0xfff, host->base + MMCICLEAR); 679 writel(0xfff, host->base + MMCICLEAR);
680 680
681#ifdef CONFIG_GPIOLIB
682 if (gpio_is_valid(plat->gpio_cd)) { 681 if (gpio_is_valid(plat->gpio_cd)) {
683 ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); 682 ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)");
684 if (ret == 0) 683 if (ret == 0)
@@ -697,7 +696,6 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
697 else if (ret != -ENOSYS) 696 else if (ret != -ENOSYS)
698 goto err_gpio_wp; 697 goto err_gpio_wp;
699 } 698 }
700#endif
701 699
702 ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host); 700 ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);
703 if (ret) 701 if (ret)
diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index f424146a2bc9..ac8aa09ba0da 100644
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/drivers/pcmcia/sa1100_assabet.c
@@ -130,7 +130,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
130 .socket_suspend = assabet_pcmcia_socket_suspend, 130 .socket_suspend = assabet_pcmcia_socket_suspend,
131}; 131};
132 132
133int __init pcmcia_assabet_init(struct device *dev) 133int pcmcia_assabet_init(struct device *dev)
134{ 134{
135 int ret = -ENODEV; 135 int ret = -ENODEV;
136 136
diff --git a/drivers/pcmcia/sa1100_neponset.c b/drivers/pcmcia/sa1100_neponset.c
index 4c41e86ccff9..0c76d337815b 100644
--- a/drivers/pcmcia/sa1100_neponset.c
+++ b/drivers/pcmcia/sa1100_neponset.c
@@ -123,7 +123,7 @@ static struct pcmcia_low_level neponset_pcmcia_ops = {
123 .socket_suspend = sa1111_pcmcia_socket_suspend, 123 .socket_suspend = sa1111_pcmcia_socket_suspend,
124}; 124};
125 125
126int __init pcmcia_neponset_init(struct sa1111_dev *sadev) 126int pcmcia_neponset_init(struct sa1111_dev *sadev)
127{ 127{
128 int ret = -ENODEV; 128 int ret = -ENODEV;
129 129
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 7f5e26873220..2199d819a987 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -638,7 +638,7 @@ static void __init sa1100_init_ports(void)
638 PPSR |= PPC_TXD1 | PPC_TXD3; 638 PPSR |= PPC_TXD1 | PPC_TXD3;
639} 639}
640 640
641void __init sa1100_register_uart_fns(struct sa1100_port_fns *fns) 641void __devinit sa1100_register_uart_fns(struct sa1100_port_fns *fns)
642{ 642{
643 if (fns->get_mctrl) 643 if (fns->get_mctrl)
644 sa1100_pops.get_mctrl = fns->get_mctrl; 644 sa1100_pops.get_mctrl = fns->get_mctrl;
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-17 21:52:02 -0500