Merge master.kernel.org:/home/rmk/linux-2.6-arm

+6 -4

Documentation/arm/tcm.txt

··· 29 29 actually move the physical location of the TCM around. At the 30 30 place you put it, it will mask any underlying RAM from the 31 31 CPU so it is usually wise not to overlap any physical RAM with 32 - the TCM. The TCM memory exists totally outside the MMU and will 33 - override any MMU mappings. 32 + the TCM. 34 33 35 - Code executing inside the ITCM does not "see" any MMU mappings 36 - and e.g. register accesses must be made to physical addresses. 34 + The TCM memory can then be remapped to another address again using 35 + the MMU, but notice that the TCM if often used in situations where 36 + the MMU is turned off. To avoid confusion the current Linux 37 + implementation will map the TCM 1 to 1 from physical to virtual 38 + memory in the location specified by the machine. 37 39 38 40 TCM is used for a few things: 39 41

+6 -6

MAINTAINERS

··· 646 646 M: Lennert Buytenhek <kernel@wantstofly.org> 647 647 M: Dan Williams <dan.j.williams@intel.com> 648 648 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 649 - S: Supported 649 + S: Maintained 650 650 651 651 ARM/INTEL IOP33X ARM ARCHITECTURE 652 652 M: Dan Williams <dan.j.williams@intel.com> 653 653 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 654 - S: Supported 654 + S: Maintained 655 655 656 656 ARM/INTEL IOP13XX ARM ARCHITECTURE 657 657 M: Lennert Buytenhek <kernel@wantstofly.org> 658 658 M: Dan Williams <dan.j.williams@intel.com> 659 659 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 660 - S: Supported 660 + S: Maintained 661 661 662 662 ARM/INTEL IQ81342EX MACHINE SUPPORT 663 663 M: Lennert Buytenhek <kernel@wantstofly.org> 664 664 M: Dan Williams <dan.j.williams@intel.com> 665 665 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 666 - S: Supported 666 + S: Maintained 667 667 668 668 ARM/INTEL IXP2000 ARM ARCHITECTURE 669 669 M: Lennert Buytenhek <kernel@wantstofly.org> ··· 691 691 M: Lennert Buytenhek <kernel@wantstofly.org> 692 692 M: Dan Williams <dan.j.williams@intel.com> 693 693 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 694 - S: Supported 694 + S: Maintained 695 695 696 696 ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT 697 697 M: Lennert Buytenhek <kernel@wantstofly.org> ··· 2695 2695 2696 2696 INTEL IOP-ADMA DMA DRIVER 2697 2697 M: Dan Williams <dan.j.williams@intel.com> 2698 - S: Supported 2698 + S: Maintained 2699 2699 F: drivers/dma/iop-adma.c 2700 2700 2701 2701 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT

+12 -13

arch/arm/common/sa1111.c

··· 1032 1032 1033 1033 return __sa1111_pll_clock(sachip); 1034 1034 } 1035 + EXPORT_SYMBOL(sa1111_pll_clock); 1035 1036 1036 1037 /** 1037 1038 * sa1111_select_audio_mode - select I2S or AC link mode ··· 1060 1059 1061 1060 spin_unlock_irqrestore(&sachip->lock, flags); 1062 1061 } 1062 + EXPORT_SYMBOL(sa1111_select_audio_mode); 1063 1063 1064 1064 /** 1065 1065 * sa1111_set_audio_rate - set the audio sample rate ··· 1085 1083 1086 1084 return 0; 1087 1085 } 1086 + EXPORT_SYMBOL(sa1111_set_audio_rate); 1088 1087 1089 1088 /** 1090 1089 * sa1111_get_audio_rate - get the audio sample rate ··· 1103 1100 1104 1101 return __sa1111_pll_clock(sachip) / (256 * div); 1105 1102 } 1103 + EXPORT_SYMBOL(sa1111_get_audio_rate); 1106 1104 1107 1105 void sa1111_set_io_dir(struct sa1111_dev *sadev, 1108 1106 unsigned int bits, unsigned int dir, ··· 1132 1128 MODIFY_BITS(gpio + SA1111_GPIO_PCSDR, (bits >> 16) & 255, sleep_dir >> 16); 1133 1129 spin_unlock_irqrestore(&sachip->lock, flags); 1134 1130 } 1131 + EXPORT_SYMBOL(sa1111_set_io_dir); 1135 1132 1136 1133 void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v) 1137 1134 { ··· 1147 1142 MODIFY_BITS(gpio + SA1111_GPIO_PCDWR, (bits >> 16) & 255, v >> 16); 1148 1143 spin_unlock_irqrestore(&sachip->lock, flags); 1149 1144 } 1145 + EXPORT_SYMBOL(sa1111_set_io); 1150 1146 1151 1147 void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v) 1152 1148 { ··· 1162 1156 MODIFY_BITS(gpio + SA1111_GPIO_PCSSR, (bits >> 16) & 255, v >> 16); 1163 1157 spin_unlock_irqrestore(&sachip->lock, flags); 1164 1158 } 1159 + EXPORT_SYMBOL(sa1111_set_sleep_io); 1165 1160 1166 1161 /* 1167 1162 * Individual device operations. ··· 1183 1176 sa1111_writel(val | sadev->skpcr_mask, sachip->base + SA1111_SKPCR); 1184 1177 spin_unlock_irqrestore(&sachip->lock, flags); 1185 1178 } 1179 + EXPORT_SYMBOL(sa1111_enable_device); 1186 1180 1187 1181 /** 1188 1182 * sa1111_disable_device - disable an on-chip SA1111 function block ··· 1200 1192 sa1111_writel(val & ~sadev->skpcr_mask, sachip->base + SA1111_SKPCR); 1201 1193 spin_unlock_irqrestore(&sachip->lock, flags); 1202 1194 } 1195 + EXPORT_SYMBOL(sa1111_disable_device); 1203 1196 1204 1197 /* 1205 1198 * SA1111 "Register Access Bus." ··· 1268 1259 .suspend = sa1111_bus_suspend, 1269 1260 .resume = sa1111_bus_resume, 1270 1261 }; 1262 + EXPORT_SYMBOL(sa1111_bus_type); 1271 1263 1272 1264 int sa1111_driver_register(struct sa1111_driver *driver) 1273 1265 { 1274 1266 driver->drv.bus = &sa1111_bus_type; 1275 1267 return driver_register(&driver->drv); 1276 1268 } 1269 + EXPORT_SYMBOL(sa1111_driver_register); 1277 1270 1278 1271 void sa1111_driver_unregister(struct sa1111_driver *driver) 1279 1272 { 1280 1273 driver_unregister(&driver->drv); 1281 1274 } 1275 + EXPORT_SYMBOL(sa1111_driver_unregister); 1282 1276 1283 1277 static int __init sa1111_init(void) 1284 1278 { ··· 1302 1290 1303 1291 MODULE_DESCRIPTION("Intel Corporation SA1111 core driver"); 1304 1292 MODULE_LICENSE("GPL"); 1305 - 1306 - EXPORT_SYMBOL(sa1111_select_audio_mode); 1307 - EXPORT_SYMBOL(sa1111_set_audio_rate); 1308 - EXPORT_SYMBOL(sa1111_get_audio_rate); 1309 - EXPORT_SYMBOL(sa1111_set_io_dir); 1310 - EXPORT_SYMBOL(sa1111_set_io); 1311 - EXPORT_SYMBOL(sa1111_set_sleep_io); 1312 - EXPORT_SYMBOL(sa1111_enable_device); 1313 - EXPORT_SYMBOL(sa1111_disable_device); 1314 - EXPORT_SYMBOL(sa1111_pll_clock); 1315 - EXPORT_SYMBOL(sa1111_bus_type); 1316 - EXPORT_SYMBOL(sa1111_driver_register); 1317 - EXPORT_SYMBOL(sa1111_driver_unregister);

-1

arch/arm/configs/h3600_defconfig

··· 90 90 # CONFIG_SA1100_COLLIE is not set 91 91 # CONFIG_SA1100_H3100 is not set 92 92 CONFIG_SA1100_H3600=y 93 - CONFIG_SA1100_H3XXX=y 94 93 # CONFIG_SA1100_BADGE4 is not set 95 94 # CONFIG_SA1100_JORNADA720 is not set 96 95 # CONFIG_SA1100_HACKKIT is not set

+431 -127

arch/arm/configs/iop33x_defconfig

··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.24-rc5 4 - # Wed Dec 12 16:11:27 2007 3 + # Linux kernel version: 2.6.31-rc6 4 + # Tue Aug 18 13:41:41 2009 5 5 # 6 6 CONFIG_ARM=y 7 7 CONFIG_SYS_SUPPORTS_APM_EMULATION=y 8 - # CONFIG_GENERIC_GPIO is not set 9 - # CONFIG_GENERIC_TIME is not set 10 - # CONFIG_GENERIC_CLOCKEVENTS is not set 8 + CONFIG_GENERIC_GPIO=y 11 9 CONFIG_MMU=y 12 - # CONFIG_NO_IOPORT is not set 13 10 CONFIG_GENERIC_HARDIRQS=y 14 11 CONFIG_STACKTRACE_SUPPORT=y 12 + CONFIG_HAVE_LATENCYTOP_SUPPORT=y 15 13 CONFIG_LOCKDEP_SUPPORT=y 16 14 CONFIG_TRACE_IRQFLAGS_SUPPORT=y 17 15 CONFIG_HARDIRQS_SW_RESEND=y 18 16 CONFIG_GENERIC_IRQ_PROBE=y 19 17 CONFIG_RWSEM_GENERIC_SPINLOCK=y 20 - # CONFIG_ARCH_HAS_ILOG2_U32 is not set 21 - # CONFIG_ARCH_HAS_ILOG2_U64 is not set 22 18 CONFIG_GENERIC_HWEIGHT=y 23 19 CONFIG_GENERIC_CALIBRATE_DELAY=y 24 - CONFIG_ZONE_DMA=y 20 + CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 25 21 CONFIG_VECTORS_BASE=0xffff0000 26 22 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 23 + CONFIG_CONSTRUCTORS=y 27 24 28 25 # 29 26 # General setup ··· 37 40 CONFIG_BSD_PROCESS_ACCT=y 38 41 # CONFIG_BSD_PROCESS_ACCT_V3 is not set 39 42 # CONFIG_TASKSTATS is not set 40 - # CONFIG_USER_NS is not set 41 - # CONFIG_PID_NS is not set 42 43 # CONFIG_AUDIT is not set 44 + 45 + # 46 + # RCU Subsystem 47 + # 48 + # CONFIG_CLASSIC_RCU is not set 49 + CONFIG_TREE_RCU=y 50 + # CONFIG_PREEMPT_RCU is not set 51 + # CONFIG_RCU_TRACE is not set 52 + CONFIG_RCU_FANOUT=32 53 + # CONFIG_RCU_FANOUT_EXACT is not set 54 + # CONFIG_TREE_RCU_TRACE is not set 55 + # CONFIG_PREEMPT_RCU_TRACE is not set 43 56 # CONFIG_IKCONFIG is not set 44 57 CONFIG_LOG_BUF_SHIFT=14 58 + # CONFIG_GROUP_SCHED is not set 45 59 # CONFIG_CGROUPS is not set 46 - CONFIG_FAIR_GROUP_SCHED=y 47 - CONFIG_FAIR_USER_SCHED=y 48 - # CONFIG_FAIR_CGROUP_SCHED is not set 49 - CONFIG_SYSFS_DEPRECATED=y 60 + # CONFIG_SYSFS_DEPRECATED_V2 is not set 50 61 # CONFIG_RELAY is not set 62 + CONFIG_NAMESPACES=y 63 + # CONFIG_UTS_NS is not set 64 + # CONFIG_IPC_NS is not set 65 + # CONFIG_USER_NS is not set 66 + # CONFIG_PID_NS is not set 67 + # CONFIG_NET_NS is not set 51 68 CONFIG_BLK_DEV_INITRD=y 52 69 CONFIG_INITRAMFS_SOURCE="" 70 + CONFIG_RD_GZIP=y 71 + CONFIG_RD_BZIP2=y 72 + CONFIG_RD_LZMA=y 53 73 CONFIG_CC_OPTIMIZE_FOR_SIZE=y 54 74 CONFIG_SYSCTL=y 75 + CONFIG_ANON_INODES=y 55 76 # CONFIG_EMBEDDED is not set 56 77 CONFIG_UID16=y 57 78 CONFIG_SYSCTL_SYSCALL=y ··· 82 67 CONFIG_ELF_CORE=y 83 68 CONFIG_BASE_FULL=y 84 69 CONFIG_FUTEX=y 85 - CONFIG_ANON_INODES=y 86 70 CONFIG_EPOLL=y 87 71 CONFIG_SIGNALFD=y 72 + CONFIG_TIMERFD=y 88 73 CONFIG_EVENTFD=y 89 74 CONFIG_SHMEM=y 75 + CONFIG_AIO=y 76 + 77 + # 78 + # Performance Counters 79 + # 90 80 CONFIG_VM_EVENT_COUNTERS=y 81 + CONFIG_PCI_QUIRKS=y 82 + # CONFIG_STRIP_ASM_SYMS is not set 83 + CONFIG_COMPAT_BRK=y 91 84 CONFIG_SLAB=y 92 85 # CONFIG_SLUB is not set 93 86 # CONFIG_SLOB is not set 87 + # CONFIG_PROFILING is not set 88 + # CONFIG_MARKERS is not set 89 + CONFIG_HAVE_OPROFILE=y 90 + # CONFIG_KPROBES is not set 91 + CONFIG_HAVE_KPROBES=y 92 + CONFIG_HAVE_KRETPROBES=y 93 + 94 + # 95 + # GCOV-based kernel profiling 96 + # 97 + # CONFIG_SLOW_WORK is not set 98 + CONFIG_HAVE_GENERIC_DMA_COHERENT=y 99 + CONFIG_SLABINFO=y 94 100 CONFIG_RT_MUTEXES=y 95 - # CONFIG_TINY_SHMEM is not set 96 101 CONFIG_BASE_SMALL=0 97 102 CONFIG_MODULES=y 103 + # CONFIG_MODULE_FORCE_LOAD is not set 98 104 CONFIG_MODULE_UNLOAD=y 99 105 # CONFIG_MODULE_FORCE_UNLOAD is not set 100 106 # CONFIG_MODVERSIONS is not set 101 107 # CONFIG_MODULE_SRCVERSION_ALL is not set 102 - CONFIG_KMOD=y 103 108 CONFIG_BLOCK=y 104 - # CONFIG_LBD is not set 105 - # CONFIG_BLK_DEV_IO_TRACE is not set 106 - # CONFIG_LSF is not set 109 + CONFIG_LBDAF=y 107 110 # CONFIG_BLK_DEV_BSG is not set 111 + # CONFIG_BLK_DEV_INTEGRITY is not set 108 112 109 113 # 110 114 # IO Schedulers ··· 137 103 CONFIG_DEFAULT_CFQ=y 138 104 # CONFIG_DEFAULT_NOOP is not set 139 105 CONFIG_DEFAULT_IOSCHED="cfq" 106 + # CONFIG_FREEZER is not set 140 107 141 108 # 142 109 # System Type ··· 147 112 # CONFIG_ARCH_REALVIEW is not set 148 113 # CONFIG_ARCH_VERSATILE is not set 149 114 # CONFIG_ARCH_AT91 is not set 150 - # CONFIG_ARCH_CLPS7500 is not set 151 115 # CONFIG_ARCH_CLPS711X is not set 152 - # CONFIG_ARCH_CO285 is not set 116 + # CONFIG_ARCH_GEMINI is not set 153 117 # CONFIG_ARCH_EBSA110 is not set 154 118 # CONFIG_ARCH_EP93XX is not set 155 119 # CONFIG_ARCH_FOOTBRIDGE is not set 120 + # CONFIG_ARCH_MXC is not set 121 + # CONFIG_ARCH_STMP3XXX is not set 156 122 # CONFIG_ARCH_NETX is not set 157 123 # CONFIG_ARCH_H720X is not set 158 - # CONFIG_ARCH_IMX is not set 159 124 # CONFIG_ARCH_IOP13XX is not set 160 125 # CONFIG_ARCH_IOP32X is not set 161 126 CONFIG_ARCH_IOP33X=y ··· 163 128 # CONFIG_ARCH_IXP2000 is not set 164 129 # CONFIG_ARCH_IXP4XX is not set 165 130 # CONFIG_ARCH_L7200 is not set 131 + # CONFIG_ARCH_KIRKWOOD is not set 132 + # CONFIG_ARCH_LOKI is not set 133 + # CONFIG_ARCH_MV78XX0 is not set 134 + # CONFIG_ARCH_ORION5X is not set 135 + # CONFIG_ARCH_MMP is not set 166 136 # CONFIG_ARCH_KS8695 is not set 167 137 # CONFIG_ARCH_NS9XXX is not set 168 - # CONFIG_ARCH_MXC is not set 138 + # CONFIG_ARCH_W90X900 is not set 169 139 # CONFIG_ARCH_PNX4008 is not set 170 140 # CONFIG_ARCH_PXA is not set 141 + # CONFIG_ARCH_MSM is not set 171 142 # CONFIG_ARCH_RPC is not set 172 143 # CONFIG_ARCH_SA1100 is not set 173 144 # CONFIG_ARCH_S3C2410 is not set 145 + # CONFIG_ARCH_S3C64XX is not set 174 146 # CONFIG_ARCH_SHARK is not set 175 147 # CONFIG_ARCH_LH7A40X is not set 148 + # CONFIG_ARCH_U300 is not set 176 149 # CONFIG_ARCH_DAVINCI is not set 177 150 # CONFIG_ARCH_OMAP is not set 178 - CONFIG_IOP3XX_ATU=y 179 151 180 152 # 181 153 # IOP33x Implementation Options ··· 193 151 # 194 152 CONFIG_ARCH_IQ80331=y 195 153 CONFIG_MACH_IQ80332=y 196 - 197 - # 198 - # Boot options 199 - # 200 - 201 - # 202 - # Power management 203 - # 204 154 CONFIG_PLAT_IOP=y 205 155 206 156 # ··· 202 168 CONFIG_CPU_XSCALE=y 203 169 CONFIG_CPU_32v5=y 204 170 CONFIG_CPU_ABRT_EV5T=y 171 + CONFIG_CPU_PABRT_NOIFAR=y 205 172 CONFIG_CPU_CACHE_VIVT=y 206 173 CONFIG_CPU_TLB_V4WBI=y 207 174 CONFIG_CPU_CP15=y ··· 213 178 # 214 179 # CONFIG_ARM_THUMB is not set 215 180 # CONFIG_CPU_DCACHE_DISABLE is not set 216 - # CONFIG_OUTER_CACHE is not set 217 181 # CONFIG_IWMMXT is not set 218 182 CONFIG_XSCALE_PMU=y 219 183 ··· 224 190 # CONFIG_ARCH_SUPPORTS_MSI is not set 225 191 CONFIG_PCI_LEGACY=y 226 192 # CONFIG_PCI_DEBUG is not set 193 + # CONFIG_PCI_STUB is not set 194 + # CONFIG_PCI_IOV is not set 227 195 # CONFIG_PCCARD is not set 228 196 229 197 # 230 198 # Kernel Features 231 199 # 232 - # CONFIG_TICK_ONESHOT is not set 200 + CONFIG_VMSPLIT_3G=y 201 + # CONFIG_VMSPLIT_2G is not set 202 + # CONFIG_VMSPLIT_1G is not set 203 + CONFIG_PAGE_OFFSET=0xC0000000 233 204 # CONFIG_PREEMPT is not set 234 205 CONFIG_HZ=100 235 206 # CONFIG_AEABI is not set 236 - # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 207 + # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 208 + # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 209 + # CONFIG_HIGHMEM is not set 237 210 CONFIG_SELECT_MEMORY_MODEL=y 238 211 CONFIG_FLATMEM_MANUAL=y 239 212 # CONFIG_DISCONTIGMEM_MANUAL is not set 240 213 # CONFIG_SPARSEMEM_MANUAL is not set 241 214 CONFIG_FLATMEM=y 242 215 CONFIG_FLAT_NODE_MEM_MAP=y 243 - # CONFIG_SPARSEMEM_STATIC is not set 244 - # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set 216 + CONFIG_PAGEFLAGS_EXTENDED=y 245 217 CONFIG_SPLIT_PTLOCK_CPUS=4096 246 - # CONFIG_RESOURCES_64BIT is not set 247 - CONFIG_ZONE_DMA_FLAG=1 248 - CONFIG_BOUNCE=y 218 + # CONFIG_PHYS_ADDR_T_64BIT is not set 219 + CONFIG_ZONE_DMA_FLAG=0 249 220 CONFIG_VIRT_TO_BUS=y 221 + CONFIG_HAVE_MLOCK=y 222 + CONFIG_HAVE_MLOCKED_PAGE_BIT=y 223 + CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 250 224 CONFIG_ALIGNMENT_TRAP=y 225 + # CONFIG_UACCESS_WITH_MEMCPY is not set 251 226 252 227 # 253 228 # Boot options 254 229 # 255 230 CONFIG_ZBOOT_ROM_TEXT=0x0 256 231 CONFIG_ZBOOT_ROM_BSS=0x0 257 - CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc" 232 + CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp cachepolicy=writealloc iop3xx_init_atu=y" 258 233 # CONFIG_XIP_KERNEL is not set 259 234 # CONFIG_KEXEC is not set 235 + 236 + # 237 + # CPU Power Management 238 + # 239 + # CONFIG_CPU_IDLE is not set 260 240 261 241 # 262 242 # Floating point emulation ··· 287 239 # Userspace binary formats 288 240 # 289 241 CONFIG_BINFMT_ELF=y 242 + # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 243 + CONFIG_HAVE_AOUT=y 290 244 CONFIG_BINFMT_AOUT=y 291 245 # CONFIG_BINFMT_MISC is not set 292 246 # CONFIG_ARTHUR is not set ··· 297 247 # Power management options 298 248 # 299 249 # CONFIG_PM is not set 300 - CONFIG_SUSPEND_UP_POSSIBLE=y 301 - 302 - # 303 - # Networking 304 - # 250 + CONFIG_ARCH_SUSPEND_POSSIBLE=y 305 251 CONFIG_NET=y 306 252 307 253 # ··· 310 264 # CONFIG_XFRM_USER is not set 311 265 # CONFIG_XFRM_SUB_POLICY is not set 312 266 # CONFIG_XFRM_MIGRATE is not set 267 + # CONFIG_XFRM_STATISTICS is not set 313 268 # CONFIG_NET_KEY is not set 314 269 CONFIG_INET=y 315 270 CONFIG_IP_MULTICAST=y ··· 357 310 # CONFIG_IPV6_SIT is not set 358 311 # CONFIG_IPV6_TUNNEL is not set 359 312 # CONFIG_IPV6_MULTIPLE_TABLES is not set 313 + # CONFIG_IPV6_MROUTE is not set 360 314 # CONFIG_NETWORK_SECMARK is not set 361 315 # CONFIG_NETFILTER is not set 362 316 # CONFIG_IP_DCCP is not set ··· 365 317 # CONFIG_TIPC is not set 366 318 # CONFIG_ATM is not set 367 319 # CONFIG_BRIDGE is not set 320 + # CONFIG_NET_DSA is not set 368 321 # CONFIG_VLAN_8021Q is not set 369 322 # CONFIG_DECNET is not set 370 323 # CONFIG_LLC2 is not set ··· 375 326 # CONFIG_LAPB is not set 376 327 # CONFIG_ECONET is not set 377 328 # CONFIG_WAN_ROUTER is not set 329 + # CONFIG_PHONET is not set 330 + # CONFIG_IEEE802154 is not set 378 331 # CONFIG_NET_SCHED is not set 332 + # CONFIG_DCB is not set 379 333 380 334 # 381 335 # Network testing 382 336 # 383 337 # CONFIG_NET_PKTGEN is not set 384 338 # CONFIG_HAMRADIO is not set 339 + # CONFIG_CAN is not set 385 340 # CONFIG_IRDA is not set 386 341 # CONFIG_BT is not set 387 342 # CONFIG_AF_RXRPC is not set 343 + CONFIG_WIRELESS=y 344 + # CONFIG_CFG80211 is not set 345 + # CONFIG_WIRELESS_OLD_REGULATORY is not set 346 + # CONFIG_WIRELESS_EXT is not set 347 + # CONFIG_LIB80211 is not set 388 348 389 349 # 390 - # Wireless 350 + # CFG80211 needs to be enabled for MAC80211 391 351 # 392 - # CONFIG_CFG80211 is not set 393 - # CONFIG_WIRELESS_EXT is not set 394 - # CONFIG_MAC80211 is not set 395 - # CONFIG_IEEE80211 is not set 352 + CONFIG_MAC80211_DEFAULT_PS_VALUE=0 353 + # CONFIG_WIMAX is not set 396 354 # CONFIG_RFKILL is not set 397 355 # CONFIG_NET_9P is not set 398 356 ··· 413 357 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 414 358 CONFIG_STANDALONE=y 415 359 CONFIG_PREVENT_FIRMWARE_BUILD=y 416 - # CONFIG_FW_LOADER is not set 360 + CONFIG_FW_LOADER=y 361 + CONFIG_FIRMWARE_IN_KERNEL=y 362 + CONFIG_EXTRA_FIRMWARE="" 417 363 # CONFIG_DEBUG_DRIVER is not set 418 364 # CONFIG_DEBUG_DEVRES is not set 419 365 # CONFIG_SYS_HYPERVISOR is not set ··· 424 366 # CONFIG_MTD_DEBUG is not set 425 367 # CONFIG_MTD_CONCAT is not set 426 368 CONFIG_MTD_PARTITIONS=y 369 + # CONFIG_MTD_TESTS is not set 427 370 CONFIG_MTD_REDBOOT_PARTS=y 428 371 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 429 372 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y 430 373 CONFIG_MTD_REDBOOT_PARTS_READONLY=y 431 374 # CONFIG_MTD_CMDLINE_PARTS is not set 432 375 # CONFIG_MTD_AFS_PARTS is not set 376 + # CONFIG_MTD_AR7_PARTS is not set 433 377 434 378 # 435 379 # User Modules And Translation Layers ··· 481 421 # 482 422 # CONFIG_MTD_COMPLEX_MAPPINGS is not set 483 423 CONFIG_MTD_PHYSMAP=y 484 - CONFIG_MTD_PHYSMAP_START=0x0 485 - CONFIG_MTD_PHYSMAP_LEN=0x0 486 - CONFIG_MTD_PHYSMAP_BANKWIDTH=1 424 + # CONFIG_MTD_PHYSMAP_COMPAT is not set 487 425 # CONFIG_MTD_ARM_INTEGRATOR is not set 488 426 # CONFIG_MTD_INTEL_VR_NOR is not set 489 427 # CONFIG_MTD_PLATRAM is not set ··· 505 447 # CONFIG_MTD_ONENAND is not set 506 448 507 449 # 450 + # LPDDR flash memory drivers 451 + # 452 + # CONFIG_MTD_LPDDR is not set 453 + 454 + # 508 455 # UBI - Unsorted block images 509 456 # 510 457 # CONFIG_MTD_UBI is not set ··· 526 463 CONFIG_BLK_DEV_RAM=y 527 464 CONFIG_BLK_DEV_RAM_COUNT=16 528 465 CONFIG_BLK_DEV_RAM_SIZE=8192 529 - CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 466 + # CONFIG_BLK_DEV_XIP is not set 530 467 # CONFIG_CDROM_PKTCDVD is not set 531 468 # CONFIG_ATA_OVER_ETH is not set 469 + # CONFIG_MG_DISK is not set 532 470 CONFIG_MISC_DEVICES=y 533 471 # CONFIG_PHANTOM is not set 534 - # CONFIG_EEPROM_93CX6 is not set 535 472 # CONFIG_SGI_IOC4 is not set 536 473 # CONFIG_TIFM_CORE is not set 474 + # CONFIG_ICS932S401 is not set 475 + # CONFIG_ENCLOSURE_SERVICES is not set 476 + # CONFIG_HP_ILO is not set 477 + # CONFIG_ISL29003 is not set 478 + # CONFIG_C2PORT is not set 479 + 480 + # 481 + # EEPROM support 482 + # 483 + # CONFIG_EEPROM_AT24 is not set 484 + # CONFIG_EEPROM_LEGACY is not set 485 + # CONFIG_EEPROM_MAX6875 is not set 486 + # CONFIG_EEPROM_93CX6 is not set 487 + # CONFIG_CB710_CORE is not set 488 + CONFIG_HAVE_IDE=y 537 489 # CONFIG_IDE is not set 538 490 539 491 # ··· 570 492 # CONFIG_BLK_DEV_SR is not set 571 493 CONFIG_CHR_DEV_SG=y 572 494 # CONFIG_CHR_DEV_SCH is not set 573 - 574 - # 575 - # Some SCSI devices (e.g. CD jukebox) support multiple LUNs 576 - # 577 495 # CONFIG_SCSI_MULTI_LUN is not set 578 496 # CONFIG_SCSI_CONSTANTS is not set 579 497 # CONFIG_SCSI_LOGGING is not set ··· 586 512 # CONFIG_SCSI_SRP_ATTRS is not set 587 513 CONFIG_SCSI_LOWLEVEL=y 588 514 # CONFIG_ISCSI_TCP is not set 515 + # CONFIG_SCSI_CXGB3_ISCSI is not set 516 + # CONFIG_SCSI_BNX2_ISCSI is not set 589 517 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set 590 518 # CONFIG_SCSI_3W_9XXX is not set 591 519 # CONFIG_SCSI_ACARD is not set ··· 596 520 # CONFIG_SCSI_AIC7XXX_OLD is not set 597 521 # CONFIG_SCSI_AIC79XX is not set 598 522 # CONFIG_SCSI_AIC94XX is not set 523 + # CONFIG_SCSI_MVSAS is not set 599 524 # CONFIG_SCSI_DPT_I2O is not set 600 525 # CONFIG_SCSI_ADVANSYS is not set 601 526 # CONFIG_SCSI_ARCMSR is not set 602 527 # CONFIG_MEGARAID_NEWGEN is not set 603 528 # CONFIG_MEGARAID_LEGACY is not set 604 529 # CONFIG_MEGARAID_SAS is not set 530 + # CONFIG_SCSI_MPT2SAS is not set 605 531 # CONFIG_SCSI_HPTIOP is not set 532 + # CONFIG_LIBFC is not set 533 + # CONFIG_LIBFCOE is not set 534 + # CONFIG_FCOE is not set 606 535 # CONFIG_SCSI_DMX3191D is not set 607 536 # CONFIG_SCSI_FUTURE_DOMAIN is not set 608 537 # CONFIG_SCSI_IPS is not set ··· 624 543 # CONFIG_SCSI_NSP32 is not set 625 544 # CONFIG_SCSI_DEBUG is not set 626 545 # CONFIG_SCSI_SRP is not set 546 + # CONFIG_SCSI_DH is not set 547 + # CONFIG_SCSI_OSD_INITIATOR is not set 627 548 # CONFIG_ATA is not set 628 549 CONFIG_MD=y 629 550 CONFIG_BLK_DEV_MD=y 551 + CONFIG_MD_AUTODETECT=y 630 552 CONFIG_MD_LINEAR=y 631 553 CONFIG_MD_RAID0=y 632 554 CONFIG_MD_RAID1=y 633 555 # CONFIG_MD_RAID10 is not set 634 556 CONFIG_MD_RAID456=y 635 - # CONFIG_MD_RAID5_RESHAPE is not set 557 + CONFIG_MD_RAID6_PQ=y 636 558 # CONFIG_MD_MULTIPATH is not set 637 559 # CONFIG_MD_FAULTY is not set 638 560 CONFIG_BLK_DEV_DM=y ··· 652 568 # 653 569 # IEEE 1394 (FireWire) support 654 570 # 571 + 572 + # 573 + # You can enable one or both FireWire driver stacks. 574 + # 575 + 576 + # 577 + # See the help texts for more information. 578 + # 655 579 # CONFIG_FIREWIRE is not set 656 580 # CONFIG_IEEE1394 is not set 657 581 # CONFIG_I2O is not set 658 582 CONFIG_NETDEVICES=y 659 - # CONFIG_NETDEVICES_MULTIQUEUE is not set 660 583 # CONFIG_DUMMY is not set 661 584 # CONFIG_BONDING is not set 662 585 # CONFIG_MACVLAN is not set 663 586 # CONFIG_EQUALIZER is not set 664 587 # CONFIG_TUN is not set 665 588 # CONFIG_VETH is not set 666 - # CONFIG_IP1000 is not set 667 589 # CONFIG_ARCNET is not set 668 590 # CONFIG_NET_ETHERNET is not set 669 591 CONFIG_NETDEV_1000=y 670 592 # CONFIG_ACENIC is not set 671 593 # CONFIG_DL2K is not set 672 594 CONFIG_E1000=y 673 - CONFIG_E1000_NAPI=y 674 - # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set 675 595 # CONFIG_E1000E is not set 596 + # CONFIG_IP1000 is not set 597 + # CONFIG_IGB is not set 598 + # CONFIG_IGBVF is not set 676 599 # CONFIG_NS83820 is not set 677 600 # CONFIG_HAMACHI is not set 678 601 # CONFIG_YELLOWFIN is not set ··· 687 596 # CONFIG_SIS190 is not set 688 597 # CONFIG_SKGE is not set 689 598 # CONFIG_SKY2 is not set 690 - # CONFIG_SK98LIN is not set 691 599 # CONFIG_VIA_VELOCITY is not set 692 600 # CONFIG_TIGON3 is not set 693 601 # CONFIG_BNX2 is not set 602 + # CONFIG_CNIC is not set 694 603 # CONFIG_QLA3XXX is not set 695 604 # CONFIG_ATL1 is not set 605 + # CONFIG_ATL1E is not set 606 + # CONFIG_ATL1C is not set 607 + # CONFIG_JME is not set 696 608 CONFIG_NETDEV_10000=y 697 609 # CONFIG_CHELSIO_T1 is not set 610 + CONFIG_CHELSIO_T3_DEPENDS=y 698 611 # CONFIG_CHELSIO_T3 is not set 612 + # CONFIG_ENIC is not set 699 613 # CONFIG_IXGBE is not set 700 614 # CONFIG_IXGB is not set 701 615 # CONFIG_S2IO is not set 616 + # CONFIG_VXGE is not set 702 617 # CONFIG_MYRI10GE is not set 703 618 # CONFIG_NETXEN_NIC is not set 704 619 # CONFIG_NIU is not set 620 + # CONFIG_MLX4_EN is not set 705 621 # CONFIG_MLX4_CORE is not set 706 622 # CONFIG_TEHUTI is not set 623 + # CONFIG_BNX2X is not set 624 + # CONFIG_QLGE is not set 625 + # CONFIG_SFC is not set 626 + # CONFIG_BE2NET is not set 707 627 # CONFIG_TR is not set 708 628 709 629 # ··· 722 620 # 723 621 # CONFIG_WLAN_PRE80211 is not set 724 622 # CONFIG_WLAN_80211 is not set 623 + 624 + # 625 + # Enable WiMAX (Networking options) to see the WiMAX drivers 626 + # 725 627 # CONFIG_WAN is not set 726 628 # CONFIG_FDDI is not set 727 629 # CONFIG_HIPPI is not set 728 630 # CONFIG_PPP is not set 729 631 # CONFIG_SLIP is not set 730 632 # CONFIG_NET_FC is not set 731 - # CONFIG_SHAPER is not set 732 633 # CONFIG_NETCONSOLE is not set 733 634 # CONFIG_NETPOLL is not set 734 635 # CONFIG_NET_POLL_CONTROLLER is not set ··· 775 670 # Character devices 776 671 # 777 672 CONFIG_VT=y 673 + CONFIG_CONSOLE_TRANSLATIONS=y 778 674 CONFIG_VT_CONSOLE=y 779 675 CONFIG_HW_CONSOLE=y 780 676 # CONFIG_VT_HW_CONSOLE_BINDING is not set 677 + CONFIG_DEVKMEM=y 781 678 # CONFIG_SERIAL_NONSTANDARD is not set 679 + # CONFIG_NOZOMI is not set 782 680 783 681 # 784 682 # Serial drivers ··· 800 692 CONFIG_SERIAL_CORE_CONSOLE=y 801 693 # CONFIG_SERIAL_JSM is not set 802 694 CONFIG_UNIX98_PTYS=y 695 + # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 803 696 CONFIG_LEGACY_PTYS=y 804 697 CONFIG_LEGACY_PTY_COUNT=256 805 698 # CONFIG_IPMI_HANDLER is not set 806 699 CONFIG_HW_RANDOM=y 807 - # CONFIG_NVRAM is not set 700 + # CONFIG_HW_RANDOM_TIMERIOMEM is not set 808 701 # CONFIG_R3964 is not set 809 702 # CONFIG_APPLICOM is not set 810 703 # CONFIG_RAW_DRIVER is not set ··· 814 705 CONFIG_I2C=y 815 706 CONFIG_I2C_BOARDINFO=y 816 707 CONFIG_I2C_CHARDEV=y 817 - 818 - # 819 - # I2C Algorithms 820 - # 821 - # CONFIG_I2C_ALGOBIT is not set 822 - # CONFIG_I2C_ALGOPCF is not set 823 - # CONFIG_I2C_ALGOPCA is not set 708 + CONFIG_I2C_HELPER_AUTO=y 824 709 825 710 # 826 711 # I2C Hardware Bus support 712 + # 713 + 714 + # 715 + # PC SMBus host controller drivers 827 716 # 828 717 # CONFIG_I2C_ALI1535 is not set 829 718 # CONFIG_I2C_ALI1563 is not set ··· 829 722 # CONFIG_I2C_AMD756 is not set 830 723 # CONFIG_I2C_AMD8111 is not set 831 724 # CONFIG_I2C_I801 is not set 832 - # CONFIG_I2C_I810 is not set 725 + # CONFIG_I2C_ISCH is not set 833 726 # CONFIG_I2C_PIIX4 is not set 834 - CONFIG_I2C_IOP3XX=y 835 727 # CONFIG_I2C_NFORCE2 is not set 836 - # CONFIG_I2C_OCORES is not set 837 - # CONFIG_I2C_PARPORT_LIGHT is not set 838 - # CONFIG_I2C_PROSAVAGE is not set 839 - # CONFIG_I2C_SAVAGE4 is not set 840 - # CONFIG_I2C_SIMTEC is not set 841 728 # CONFIG_I2C_SIS5595 is not set 842 729 # CONFIG_I2C_SIS630 is not set 843 730 # CONFIG_I2C_SIS96X is not set 844 - # CONFIG_I2C_TAOS_EVM is not set 845 - # CONFIG_I2C_STUB is not set 846 731 # CONFIG_I2C_VIA is not set 847 732 # CONFIG_I2C_VIAPRO is not set 733 + 734 + # 735 + # I2C system bus drivers (mostly embedded / system-on-chip) 736 + # 737 + # CONFIG_I2C_GPIO is not set 738 + CONFIG_I2C_IOP3XX=y 739 + # CONFIG_I2C_OCORES is not set 740 + # CONFIG_I2C_SIMTEC is not set 741 + 742 + # 743 + # External I2C/SMBus adapter drivers 744 + # 745 + # CONFIG_I2C_PARPORT_LIGHT is not set 746 + # CONFIG_I2C_TAOS_EVM is not set 747 + 748 + # 749 + # Graphics adapter I2C/DDC channel drivers 750 + # 848 751 # CONFIG_I2C_VOODOO3 is not set 752 + 753 + # 754 + # Other I2C/SMBus bus drivers 755 + # 756 + # CONFIG_I2C_PCA_PLATFORM is not set 757 + # CONFIG_I2C_STUB is not set 849 758 850 759 # 851 760 # Miscellaneous I2C Chip support 852 761 # 853 - # CONFIG_SENSORS_DS1337 is not set 854 - # CONFIG_SENSORS_DS1374 is not set 855 762 # CONFIG_DS1682 is not set 856 - # CONFIG_EEPROM_LEGACY is not set 857 763 # CONFIG_SENSORS_PCF8574 is not set 764 + # CONFIG_PCF8575 is not set 858 765 # CONFIG_SENSORS_PCA9539 is not set 859 - # CONFIG_SENSORS_PCF8591 is not set 860 - # CONFIG_SENSORS_MAX6875 is not set 861 766 # CONFIG_SENSORS_TSL2550 is not set 862 767 # CONFIG_I2C_DEBUG_CORE is not set 863 768 # CONFIG_I2C_DEBUG_ALGO is not set 864 769 # CONFIG_I2C_DEBUG_BUS is not set 865 770 # CONFIG_I2C_DEBUG_CHIP is not set 771 + # CONFIG_SPI is not set 772 + CONFIG_ARCH_REQUIRE_GPIOLIB=y 773 + CONFIG_GPIOLIB=y 774 + # CONFIG_DEBUG_GPIO is not set 775 + # CONFIG_GPIO_SYSFS is not set 866 776 867 777 # 868 - # SPI support 778 + # Memory mapped GPIO expanders: 869 779 # 870 - # CONFIG_SPI is not set 871 - # CONFIG_SPI_MASTER is not set 780 + 781 + # 782 + # I2C GPIO expanders: 783 + # 784 + # CONFIG_GPIO_MAX732X is not set 785 + # CONFIG_GPIO_PCA953X is not set 786 + # CONFIG_GPIO_PCF857X is not set 787 + 788 + # 789 + # PCI GPIO expanders: 790 + # 791 + # CONFIG_GPIO_BT8XX is not set 792 + 793 + # 794 + # SPI GPIO expanders: 795 + # 872 796 # CONFIG_W1 is not set 873 797 # CONFIG_POWER_SUPPLY is not set 874 798 CONFIG_HWMON=y 875 799 # CONFIG_HWMON_VID is not set 800 + # CONFIG_SENSORS_AD7414 is not set 876 801 # CONFIG_SENSORS_AD7418 is not set 877 802 # CONFIG_SENSORS_ADM1021 is not set 878 803 # CONFIG_SENSORS_ADM1025 is not set ··· 912 773 # CONFIG_SENSORS_ADM1029 is not set 913 774 # CONFIG_SENSORS_ADM1031 is not set 914 775 # CONFIG_SENSORS_ADM9240 is not set 776 + # CONFIG_SENSORS_ADT7462 is not set 915 777 # CONFIG_SENSORS_ADT7470 is not set 778 + # CONFIG_SENSORS_ADT7473 is not set 779 + # CONFIG_SENSORS_ADT7475 is not set 916 780 # CONFIG_SENSORS_ATXP1 is not set 917 781 # CONFIG_SENSORS_DS1621 is not set 918 782 # CONFIG_SENSORS_I5K_AMB is not set 919 783 # CONFIG_SENSORS_F71805F is not set 920 784 # CONFIG_SENSORS_F71882FG is not set 921 785 # CONFIG_SENSORS_F75375S is not set 786 + # CONFIG_SENSORS_G760A is not set 922 787 # CONFIG_SENSORS_GL518SM is not set 923 788 # CONFIG_SENSORS_GL520SM is not set 924 789 # CONFIG_SENSORS_IT87 is not set ··· 937 794 # CONFIG_SENSORS_LM90 is not set 938 795 # CONFIG_SENSORS_LM92 is not set 939 796 # CONFIG_SENSORS_LM93 is not set 797 + # CONFIG_SENSORS_LTC4215 is not set 798 + # CONFIG_SENSORS_LTC4245 is not set 799 + # CONFIG_SENSORS_LM95241 is not set 940 800 # CONFIG_SENSORS_MAX1619 is not set 941 801 # CONFIG_SENSORS_MAX6650 is not set 942 802 # CONFIG_SENSORS_PC87360 is not set 943 803 # CONFIG_SENSORS_PC87427 is not set 804 + # CONFIG_SENSORS_PCF8591 is not set 805 + # CONFIG_SENSORS_SHT15 is not set 944 806 # CONFIG_SENSORS_SIS5595 is not set 945 807 # CONFIG_SENSORS_DME1737 is not set 946 808 # CONFIG_SENSORS_SMSC47M1 is not set 947 809 # CONFIG_SENSORS_SMSC47M192 is not set 948 810 # CONFIG_SENSORS_SMSC47B397 is not set 811 + # CONFIG_SENSORS_ADS7828 is not set 949 812 # CONFIG_SENSORS_THMC50 is not set 813 + # CONFIG_SENSORS_TMP401 is not set 950 814 # CONFIG_SENSORS_VIA686A is not set 951 815 # CONFIG_SENSORS_VT1211 is not set 952 816 # CONFIG_SENSORS_VT8231 is not set ··· 962 812 # CONFIG_SENSORS_W83792D is not set 963 813 # CONFIG_SENSORS_W83793 is not set 964 814 # CONFIG_SENSORS_W83L785TS is not set 815 + # CONFIG_SENSORS_W83L786NG is not set 965 816 # CONFIG_SENSORS_W83627HF is not set 966 817 # CONFIG_SENSORS_W83627EHF is not set 967 818 # CONFIG_HWMON_DEBUG_CHIP is not set 819 + # CONFIG_THERMAL is not set 820 + # CONFIG_THERMAL_HWMON is not set 968 821 # CONFIG_WATCHDOG is not set 822 + CONFIG_SSB_POSSIBLE=y 969 823 970 824 # 971 825 # Sonics Silicon Backplane 972 826 # 973 - CONFIG_SSB_POSSIBLE=y 974 827 # CONFIG_SSB is not set 975 828 976 829 # 977 830 # Multifunction device drivers 978 831 # 832 + # CONFIG_MFD_CORE is not set 979 833 # CONFIG_MFD_SM501 is not set 980 - 981 - # 982 - # Multimedia devices 983 - # 984 - # CONFIG_VIDEO_DEV is not set 985 - # CONFIG_DVB_CORE is not set 986 - CONFIG_DAB=y 834 + # CONFIG_MFD_ASIC3 is not set 835 + # CONFIG_HTC_EGPIO is not set 836 + # CONFIG_HTC_PASIC3 is not set 837 + # CONFIG_TPS65010 is not set 838 + # CONFIG_TWL4030_CORE is not set 839 + # CONFIG_MFD_TMIO is not set 840 + # CONFIG_MFD_TC6393XB is not set 841 + # CONFIG_PMIC_DA903X is not set 842 + # CONFIG_MFD_WM8400 is not set 843 + # CONFIG_MFD_WM8350_I2C is not set 844 + # CONFIG_MFD_PCF50633 is not set 845 + # CONFIG_AB3100_CORE is not set 846 + # CONFIG_MEDIA_SUPPORT is not set 987 847 988 848 # 989 849 # Graphics support ··· 1014 854 # 1015 855 # CONFIG_VGA_CONSOLE is not set 1016 856 CONFIG_DUMMY_CONSOLE=y 1017 - 1018 - # 1019 - # Sound 1020 - # 1021 857 # CONFIG_SOUND is not set 1022 858 CONFIG_HID_SUPPORT=y 1023 859 CONFIG_HID=y 1024 860 # CONFIG_HID_DEBUG is not set 1025 861 # CONFIG_HIDRAW is not set 862 + # CONFIG_HID_PID is not set 863 + 864 + # 865 + # Special HID drivers 866 + # 1026 867 CONFIG_USB_SUPPORT=y 1027 868 CONFIG_USB_ARCH_HAS_HCD=y 1028 869 CONFIG_USB_ARCH_HAS_OHCI=y ··· 1031 870 # CONFIG_USB is not set 1032 871 1033 872 # 1034 - # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 873 + # Enable Host or Gadget support to see Inventra options 1035 874 # 1036 875 1037 876 # 1038 - # USB Gadget Support 877 + # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may 1039 878 # 1040 879 # CONFIG_USB_GADGET is not set 880 + 881 + # 882 + # OTG and related infrastructure 883 + # 884 + # CONFIG_UWB is not set 1041 885 # CONFIG_MMC is not set 886 + # CONFIG_MEMSTICK is not set 887 + # CONFIG_ACCESSIBILITY is not set 1042 888 # CONFIG_NEW_LEDS is not set 1043 889 CONFIG_RTC_LIB=y 1044 890 # CONFIG_RTC_CLASS is not set ··· 1061 893 # DMA Clients 1062 894 # 1063 895 CONFIG_NET_DMA=y 896 + # CONFIG_ASYNC_TX_DMA is not set 897 + # CONFIG_DMATEST is not set 898 + # CONFIG_AUXDISPLAY is not set 899 + # CONFIG_REGULATOR is not set 900 + # CONFIG_UIO is not set 901 + # CONFIG_STAGING is not set 1064 902 1065 903 # 1066 904 # File systems ··· 1075 901 # CONFIG_EXT2_FS_XATTR is not set 1076 902 # CONFIG_EXT2_FS_XIP is not set 1077 903 CONFIG_EXT3_FS=y 904 + # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 1078 905 CONFIG_EXT3_FS_XATTR=y 1079 906 # CONFIG_EXT3_FS_POSIX_ACL is not set 1080 907 # CONFIG_EXT3_FS_SECURITY is not set 1081 - # CONFIG_EXT4DEV_FS is not set 908 + # CONFIG_EXT4_FS is not set 1082 909 CONFIG_JBD=y 1083 910 CONFIG_FS_MBCACHE=y 1084 911 # CONFIG_REISERFS_FS is not set ··· 1088 913 # CONFIG_XFS_FS is not set 1089 914 # CONFIG_GFS2_FS is not set 1090 915 # CONFIG_OCFS2_FS is not set 1091 - # CONFIG_MINIX_FS is not set 1092 - # CONFIG_ROMFS_FS is not set 916 + # CONFIG_BTRFS_FS is not set 917 + CONFIG_FILE_LOCKING=y 918 + CONFIG_FSNOTIFY=y 919 + CONFIG_DNOTIFY=y 1093 920 CONFIG_INOTIFY=y 1094 921 CONFIG_INOTIFY_USER=y 1095 922 # CONFIG_QUOTA is not set 1096 - CONFIG_DNOTIFY=y 1097 923 # CONFIG_AUTOFS_FS is not set 1098 924 # CONFIG_AUTOFS4_FS is not set 1099 925 # CONFIG_FUSE_FS is not set 926 + 927 + # 928 + # Caches 929 + # 930 + # CONFIG_FSCACHE is not set 1100 931 1101 932 # 1102 933 # CD-ROM/DVD Filesystems ··· 1122 941 # 1123 942 CONFIG_PROC_FS=y 1124 943 CONFIG_PROC_SYSCTL=y 944 + CONFIG_PROC_PAGE_MONITOR=y 1125 945 CONFIG_SYSFS=y 1126 946 CONFIG_TMPFS=y 1127 947 # CONFIG_TMPFS_POSIX_ACL is not set 1128 948 # CONFIG_HUGETLB_PAGE is not set 1129 949 # CONFIG_CONFIGFS_FS is not set 1130 - 1131 - # 1132 - # Miscellaneous filesystems 1133 - # 950 + CONFIG_MISC_FILESYSTEMS=y 1134 951 # CONFIG_ADFS_FS is not set 1135 952 # CONFIG_AFFS_FS is not set 1136 953 # CONFIG_HFS_FS is not set ··· 1138 959 # CONFIG_EFS_FS is not set 1139 960 # CONFIG_JFFS2_FS is not set 1140 961 CONFIG_CRAMFS=y 962 + # CONFIG_SQUASHFS is not set 1141 963 # CONFIG_VXFS_FS is not set 964 + # CONFIG_MINIX_FS is not set 965 + # CONFIG_OMFS_FS is not set 1142 966 # CONFIG_HPFS_FS is not set 1143 967 # CONFIG_QNX4FS_FS is not set 968 + # CONFIG_ROMFS_FS is not set 1144 969 # CONFIG_SYSV_FS is not set 1145 970 # CONFIG_UFS_FS is not set 971 + # CONFIG_NILFS2_FS is not set 1146 972 CONFIG_NETWORK_FILESYSTEMS=y 1147 973 CONFIG_NFS_FS=y 1148 974 CONFIG_NFS_V3=y 1149 975 # CONFIG_NFS_V3_ACL is not set 1150 976 # CONFIG_NFS_V4 is not set 1151 - # CONFIG_NFS_DIRECTIO is not set 977 + CONFIG_ROOT_NFS=y 1152 978 CONFIG_NFSD=y 1153 979 CONFIG_NFSD_V3=y 1154 980 # CONFIG_NFSD_V3_ACL is not set 1155 981 # CONFIG_NFSD_V4 is not set 1156 - # CONFIG_NFSD_TCP is not set 1157 - CONFIG_ROOT_NFS=y 1158 982 CONFIG_LOCKD=y 1159 983 CONFIG_LOCKD_V4=y 1160 984 CONFIG_EXPORTFS=y 1161 985 CONFIG_NFS_COMMON=y 1162 986 CONFIG_SUNRPC=y 1163 - # CONFIG_SUNRPC_BIND34 is not set 1164 987 # CONFIG_RPCSEC_GSS_KRB5 is not set 1165 988 # CONFIG_RPCSEC_GSS_SPKM3 is not set 1166 989 # CONFIG_SMB_FS is not set ··· 1194 1013 # CONFIG_SYSV68_PARTITION is not set 1195 1014 # CONFIG_NLS is not set 1196 1015 # CONFIG_DLM is not set 1197 - CONFIG_INSTRUMENTATION=y 1198 - # CONFIG_PROFILING is not set 1199 - # CONFIG_MARKERS is not set 1200 1016 1201 1017 # 1202 1018 # Kernel hacking ··· 1201 1023 # CONFIG_PRINTK_TIME is not set 1202 1024 CONFIG_ENABLE_WARN_DEPRECATED=y 1203 1025 CONFIG_ENABLE_MUST_CHECK=y 1026 + CONFIG_FRAME_WARN=1024 1204 1027 CONFIG_MAGIC_SYSRQ=y 1205 1028 # CONFIG_UNUSED_SYMBOLS is not set 1206 1029 # CONFIG_DEBUG_FS is not set ··· 1209 1030 CONFIG_DEBUG_KERNEL=y 1210 1031 # CONFIG_DEBUG_SHIRQ is not set 1211 1032 CONFIG_DETECT_SOFTLOCKUP=y 1033 + # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set 1034 + CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 1035 + CONFIG_DETECT_HUNG_TASK=y 1036 + # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set 1037 + CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 1212 1038 CONFIG_SCHED_DEBUG=y 1213 1039 # CONFIG_SCHEDSTATS is not set 1214 1040 # CONFIG_TIMER_STATS is not set 1041 + # CONFIG_DEBUG_OBJECTS is not set 1215 1042 # CONFIG_DEBUG_SLAB is not set 1043 + # CONFIG_DEBUG_KMEMLEAK is not set 1216 1044 # CONFIG_DEBUG_RT_MUTEXES is not set 1217 1045 # CONFIG_RT_MUTEX_TESTER is not set 1218 1046 # CONFIG_DEBUG_SPINLOCK is not set ··· 1233 1047 CONFIG_DEBUG_BUGVERBOSE=y 1234 1048 # CONFIG_DEBUG_INFO is not set 1235 1049 # CONFIG_DEBUG_VM is not set 1050 + # CONFIG_DEBUG_WRITECOUNT is not set 1051 + CONFIG_DEBUG_MEMORY_INIT=y 1236 1052 # CONFIG_DEBUG_LIST is not set 1237 1053 # CONFIG_DEBUG_SG is not set 1054 + # CONFIG_DEBUG_NOTIFIERS is not set 1238 1055 CONFIG_FRAME_POINTER=y 1239 - # CONFIG_FORCED_INLINING is not set 1240 1056 # CONFIG_BOOT_PRINTK_DELAY is not set 1241 1057 # CONFIG_RCU_TORTURE_TEST is not set 1058 + # CONFIG_RCU_CPU_STALL_DETECTOR is not set 1059 + # CONFIG_BACKTRACE_SELF_TEST is not set 1060 + # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 1242 1061 # CONFIG_FAULT_INJECTION is not set 1062 + # CONFIG_LATENCYTOP is not set 1063 + # CONFIG_SYSCTL_SYSCALL_CHECK is not set 1064 + # CONFIG_PAGE_POISONING is not set 1065 + CONFIG_HAVE_FUNCTION_TRACER=y 1066 + CONFIG_TRACING_SUPPORT=y 1067 + CONFIG_FTRACE=y 1068 + # CONFIG_FUNCTION_TRACER is not set 1069 + # CONFIG_SCHED_TRACER is not set 1070 + # CONFIG_ENABLE_DEFAULT_TRACERS is not set 1071 + # CONFIG_BOOT_TRACER is not set 1072 + CONFIG_BRANCH_PROFILE_NONE=y 1073 + # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 1074 + # CONFIG_PROFILE_ALL_BRANCHES is not set 1075 + # CONFIG_STACK_TRACER is not set 1076 + # CONFIG_KMEMTRACE is not set 1077 + # CONFIG_WORKQUEUE_TRACER is not set 1078 + # CONFIG_BLK_DEV_IO_TRACE is not set 1243 1079 # CONFIG_SAMPLES is not set 1080 + CONFIG_HAVE_ARCH_KGDB=y 1081 + # CONFIG_KGDB is not set 1244 1082 CONFIG_DEBUG_USER=y 1245 1083 # CONFIG_DEBUG_ERRORS is not set 1084 + # CONFIG_DEBUG_STACK_USAGE is not set 1246 1085 CONFIG_DEBUG_LL=y 1247 1086 # CONFIG_DEBUG_ICEDCC is not set 1248 1087 ··· 1276 1065 # 1277 1066 # CONFIG_KEYS is not set 1278 1067 # CONFIG_SECURITY is not set 1068 + # CONFIG_SECURITYFS is not set 1279 1069 # CONFIG_SECURITY_FILE_CAPABILITIES is not set 1280 1070 CONFIG_XOR_BLOCKS=y 1281 1071 CONFIG_ASYNC_CORE=y 1282 1072 CONFIG_ASYNC_MEMCPY=y 1283 1073 CONFIG_ASYNC_XOR=y 1284 - # CONFIG_CRYPTO is not set 1074 + CONFIG_CRYPTO=y 1075 + 1076 + # 1077 + # Crypto core or helper 1078 + # 1079 + # CONFIG_CRYPTO_FIPS is not set 1080 + # CONFIG_CRYPTO_MANAGER is not set 1081 + # CONFIG_CRYPTO_MANAGER2 is not set 1082 + # CONFIG_CRYPTO_GF128MUL is not set 1083 + # CONFIG_CRYPTO_NULL is not set 1084 + # CONFIG_CRYPTO_CRYPTD is not set 1085 + # CONFIG_CRYPTO_AUTHENC is not set 1086 + # CONFIG_CRYPTO_TEST is not set 1087 + 1088 + # 1089 + # Authenticated Encryption with Associated Data 1090 + # 1091 + # CONFIG_CRYPTO_CCM is not set 1092 + # CONFIG_CRYPTO_GCM is not set 1093 + # CONFIG_CRYPTO_SEQIV is not set 1094 + 1095 + # 1096 + # Block modes 1097 + # 1098 + # CONFIG_CRYPTO_CBC is not set 1099 + # CONFIG_CRYPTO_CTR is not set 1100 + # CONFIG_CRYPTO_CTS is not set 1101 + # CONFIG_CRYPTO_ECB is not set 1102 + # CONFIG_CRYPTO_LRW is not set 1103 + # CONFIG_CRYPTO_PCBC is not set 1104 + # CONFIG_CRYPTO_XTS is not set 1105 + 1106 + # 1107 + # Hash modes 1108 + # 1109 + # CONFIG_CRYPTO_HMAC is not set 1110 + # CONFIG_CRYPTO_XCBC is not set 1111 + 1112 + # 1113 + # Digest 1114 + # 1115 + # CONFIG_CRYPTO_CRC32C is not set 1116 + # CONFIG_CRYPTO_MD4 is not set 1117 + # CONFIG_CRYPTO_MD5 is not set 1118 + # CONFIG_CRYPTO_MICHAEL_MIC is not set 1119 + # CONFIG_CRYPTO_RMD128 is not set 1120 + # CONFIG_CRYPTO_RMD160 is not set 1121 + # CONFIG_CRYPTO_RMD256 is not set 1122 + # CONFIG_CRYPTO_RMD320 is not set 1123 + # CONFIG_CRYPTO_SHA1 is not set 1124 + # CONFIG_CRYPTO_SHA256 is not set 1125 + # CONFIG_CRYPTO_SHA512 is not set 1126 + # CONFIG_CRYPTO_TGR192 is not set 1127 + # CONFIG_CRYPTO_WP512 is not set 1128 + 1129 + # 1130 + # Ciphers 1131 + # 1132 + # CONFIG_CRYPTO_AES is not set 1133 + # CONFIG_CRYPTO_ANUBIS is not set 1134 + # CONFIG_CRYPTO_ARC4 is not set 1135 + # CONFIG_CRYPTO_BLOWFISH is not set 1136 + # CONFIG_CRYPTO_CAMELLIA is not set 1137 + # CONFIG_CRYPTO_CAST5 is not set 1138 + # CONFIG_CRYPTO_CAST6 is not set 1139 + # CONFIG_CRYPTO_DES is not set 1140 + # CONFIG_CRYPTO_FCRYPT is not set 1141 + # CONFIG_CRYPTO_KHAZAD is not set 1142 + # CONFIG_CRYPTO_SALSA20 is not set 1143 + # CONFIG_CRYPTO_SEED is not set 1144 + # CONFIG_CRYPTO_SERPENT is not set 1145 + # CONFIG_CRYPTO_TEA is not set 1146 + # CONFIG_CRYPTO_TWOFISH is not set 1147 + 1148 + # 1149 + # Compression 1150 + # 1151 + # CONFIG_CRYPTO_DEFLATE is not set 1152 + # CONFIG_CRYPTO_ZLIB is not set 1153 + # CONFIG_CRYPTO_LZO is not set 1154 + 1155 + # 1156 + # Random Number Generation 1157 + # 1158 + # CONFIG_CRYPTO_ANSI_CPRNG is not set 1159 + CONFIG_CRYPTO_HW=y 1160 + # CONFIG_CRYPTO_DEV_HIFN_795X is not set 1161 + # CONFIG_BINARY_PRINTF is not set 1285 1162 1286 1163 # 1287 1164 # Library routines 1288 1165 # 1166 + CONFIG_GENERIC_FIND_LAST_BIT=y 1289 1167 # CONFIG_CRC_CCITT is not set 1290 1168 # CONFIG_CRC16 is not set 1169 + # CONFIG_CRC_T10DIF is not set 1291 1170 # CONFIG_CRC_ITU_T is not set 1292 1171 # CONFIG_CRC32 is not set 1293 1172 # CONFIG_CRC7 is not set 1294 1173 # CONFIG_LIBCRC32C is not set 1295 1174 CONFIG_ZLIB_INFLATE=y 1296 - CONFIG_PLIST=y 1175 + CONFIG_DECOMPRESS_GZIP=y 1176 + CONFIG_DECOMPRESS_BZIP2=y 1177 + CONFIG_DECOMPRESS_LZMA=y 1297 1178 CONFIG_HAS_IOMEM=y 1298 1179 CONFIG_HAS_IOPORT=y 1299 1180 CONFIG_HAS_DMA=y 1181 + CONFIG_NLATTR=y

+20 -6

arch/arm/include/asm/glue.h

··· 120 120 #endif 121 121 122 122 /* 123 - * Prefetch abort handler. If the CPU has an IFAR use that, otherwise 124 - * use the address of the aborted instruction 123 + * Prefetch Abort Model 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 132 #undef CPU_PABORT_HANDLER 127 133 #undef MULTI_PABORT 128 134 129 - #ifdef CONFIG_CPU_PABRT_IFAR 135 + #ifdef CONFIG_CPU_PABRT_LEGACY 130 136 # ifdef CPU_PABORT_HANDLER 131 137 # define MULTI_PABORT 1 132 138 # else 133 - # define CPU_PABORT_HANDLER(reg, insn) mrc p15, 0, reg, cr6, cr0, 2 139 + # define CPU_PABORT_HANDLER legacy_pabort 134 140 # endif 135 141 #endif 136 142 137 - #ifdef CONFIG_CPU_PABRT_NOIFAR 143 + #ifdef CONFIG_CPU_PABRT_V6 138 144 # ifdef CPU_PABORT_HANDLER 139 145 # define MULTI_PABORT 1 140 146 # else 141 - # define CPU_PABORT_HANDLER(reg, insn) mov reg, insn 147 + # define CPU_PABORT_HANDLER v6_pabort 148 + # endif 149 + #endif 150 + 151 + #ifdef CONFIG_CPU_PABRT_V7 152 + # ifdef CPU_PABORT_HANDLER 153 + # define MULTI_PABORT 1 154 + # else 155 + # define CPU_PABORT_HANDLER v7_pabort 142 156 # endif 143 157 #endif 144 158

+1

arch/arm/include/asm/hardware/iop3xx.h

··· 215 215 * IOP3XX I/O and Mem space regions for PCI autoconfiguration 216 216 */ 217 217 #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 218 + #define IOP3XX_PCI_MEM_WINDOW_SIZE 0x08000000 218 219 219 220 #define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 220 221 #define IOP3XX_PCI_LOWER_IO_PA 0x90000000

+16

arch/arm/include/asm/smp_plat.h

··· 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 */ 11 + static inline int tlb_ops_need_broadcast(void) 12 + { 13 + return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 2; 14 + } 15 + 16 + #endif

+1

arch/arm/include/asm/unistd.h

··· 456 456 * Unimplemented (or alternatively implemented) syscalls 457 457 */ 458 458 #define __IGNORE_fadvise64_64 1 459 + #define __IGNORE_migrate_pages 1 459 460 460 461 #endif /* __KERNEL__ */ 461 462 #endif /* __ASM_ARM_UNISTD_H */

+6 -12

arch/arm/kernel/entry-armv.S

··· 311 311 tst r3, #PSR_I_BIT 312 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 314 mov r0, r2 @ pass address of aborted instruction. 315 + #ifdef MULTI_PABORT 322 316 ldr r4, .LCprocfns 323 317 mov lr, pc 324 318 ldr pc, [r4, #PROCESSOR_PABT_FUNC] 325 319 #else 326 - CPU_PABORT_HANDLER(r0, r2) 320 + bl CPU_PABORT_HANDLER 327 321 #endif 328 322 msr cpsr_c, r9 @ Maybe enable interrupts 329 - mov r1, sp @ regs 323 + mov r2, sp @ regs 330 324 bl do_PrefetchAbort @ call abort handler 331 325 332 326 @ ··· 695 701 __pabt_usr: 696 702 usr_entry 697 703 698 - #ifdef MULTI_PABORT 699 704 mov r0, r2 @ pass address of aborted instruction. 705 + #ifdef MULTI_PABORT 700 706 ldr r4, .LCprocfns 701 707 mov lr, pc 702 708 ldr pc, [r4, #PROCESSOR_PABT_FUNC] 703 709 #else 704 - CPU_PABORT_HANDLER(r0, r2) 710 + bl CPU_PABORT_HANDLER 705 711 #endif 706 712 enable_irq @ Enable interrupts 707 - mov r1, sp @ regs 713 + mov r2, sp @ regs 708 714 bl do_PrefetchAbort @ call abort handler 709 715 UNWIND(.fnend ) 710 716 /* fall through */

+2 -9

arch/arm/kernel/entry-common.S

··· 126 126 cmp r0, r2 127 127 bne gnu_trace 128 128 ldmia sp!, {r0-r3, ip, lr} 129 - bx ip 129 + mov pc, ip 130 130 131 131 gnu_trace: 132 132 ldr r1, [sp, #20] @ lr of instrumented routine ··· 135 135 mov lr, pc 136 136 mov pc, r2 137 137 ldmia sp!, {r0-r3, ip, lr} 138 - bx ip 138 + mov pc, ip 139 139 140 140 ENTRY(mcount) 141 141 stmdb sp!, {r0-r3, lr} ··· 424 424 b do_mmap2 425 425 #endif 426 426 ENDPROC(sys_mmap2) 427 - 428 - ENTRY(pabort_ifar) 429 - mrc p15, 0, r0, cr6, cr0, 2 430 - ENTRY(pabort_noifar) 431 - mov pc, lr 432 - ENDPROC(pabort_ifar) 433 - ENDPROC(pabort_noifar) 434 427 435 428 #ifdef CONFIG_OABI_COMPAT 436 429

+3 -1

arch/arm/kernel/head-common.S

··· 13 13 14 14 #define ATAG_CORE 0x54410001 15 15 #define ATAG_CORE_SIZE ((2*4 + 3*4) >> 2) 16 + #define ATAG_CORE_SIZE_EMPTY ((2*4) >> 2) 16 17 17 18 .align 2 18 19 .type __switch_data, %object ··· 252 251 bne 1f 253 252 254 253 ldr r5, [r2, #0] @ is first tag ATAG_CORE? 255 - subs r5, r5, #ATAG_CORE_SIZE 254 + cmp r5, #ATAG_CORE_SIZE 255 + cmpne r5, #ATAG_CORE_SIZE_EMPTY 256 256 bne 1f 257 257 ldr r5, [r2, #4] 258 258 ldr r6, =ATAG_CORE

+4 -9

arch/arm/kernel/smp.c

··· 36 36 #include <asm/tlbflush.h> 37 37 #include <asm/ptrace.h> 38 38 #include <asm/localtimer.h> 39 + #include <asm/smp_plat.h> 39 40 40 41 /* 41 42 * as from 2.5, kernels no longer have an init_tasks structure ··· 154 153 /* 155 154 * __cpu_disable runs on the processor to be shutdown. 156 155 */ 157 - int __cpuexit __cpu_disable(void) 156 + int __cpu_disable(void) 158 157 { 159 158 unsigned int cpu = smp_processor_id(); 160 159 struct task_struct *p; ··· 201 200 * called on the thread which is asking for a CPU to be shutdown - 202 201 * waits until shutdown has completed, or it is timed out. 203 202 */ 204 - void __cpuexit __cpu_die(unsigned int cpu) 203 + void __cpu_die(unsigned int cpu) 205 204 { 206 205 if (!platform_cpu_kill(cpu)) 207 206 printk("CPU%u: unable to kill\n", cpu); ··· 215 214 * of the other hotplug-cpu capable cores, so presumably coming 216 215 * out of idle fixes this. 217 216 */ 218 - void __cpuexit cpu_die(void) 217 + void __ref cpu_die(void) 219 218 { 220 219 unsigned int cpu = smp_processor_id(); 221 220 ··· 586 585 unsigned long ta_start; 587 586 unsigned long ta_end; 588 587 }; 589 - 590 - /* all SMP configurations have the extended CPUID registers */ 591 - static inline int tlb_ops_need_broadcast(void) 592 - { 593 - return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 2; 594 - } 595 588 596 589 static inline void ipi_flush_tlb_all(void *ignored) 597 590 {

+3 -1

arch/arm/kernel/smp_twd.c

··· 166 166 clockevents_register_device(clk); 167 167 } 168 168 169 + #ifdef CONFIG_HOTPLUG_CPU 169 170 /* 170 171 * take a local timer down 171 172 */ 172 - void __cpuexit twd_timer_stop(void) 173 + void twd_timer_stop(void) 173 174 { 174 175 __raw_writel(0, twd_base + TWD_TIMER_CONTROL); 175 176 } 177 + #endif

+4 -1

arch/arm/kernel/traps.c

··· 418 418 static inline void 419 419 do_cache_op(unsigned long start, unsigned long end, int flags) 420 420 { 421 + struct mm_struct *mm = current->active_mm; 421 422 struct vm_area_struct *vma; 422 423 423 424 if (end < start || flags) 424 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 429 if (vma && vma->vm_start < end) { 428 430 if (start < vma->vm_start) 429 431 start = vma->vm_start; ··· 434 432 435 433 flush_cache_user_range(vma, start, end); 436 434 } 435 + up_read(&mm->mmap_sem); 437 436 } 438 437 439 438 /*

-2

arch/arm/mach-bcmring/core.c

··· 31 31 #include <linux/clocksource.h> 32 32 #include <linux/clockchips.h> 33 33 34 - #include <linux/amba/bus.h> 35 34 #include <mach/csp/mm_addr.h> 36 35 #include <mach/hardware.h> 37 36 #include <asm/clkdev.h> ··· 44 45 #include <asm/mach/irq.h> 45 46 #include <asm/mach/time.h> 46 47 #include <asm/mach/map.h> 47 - #include <asm/mach/mmc.h> 48 48 49 49 #include <cfg_global.h> 50 50

-1

arch/arm/mach-davinci/board-dm365-evm.c

··· 35 35 #include <mach/common.h> 36 36 #include <mach/i2c.h> 37 37 #include <mach/serial.h> 38 - #include <mach/common.h> 39 38 #include <mach/mmc.h> 40 39 #include <mach/nand.h> 41 40

+1 -1

arch/arm/mach-integrator/pci_v3.c

··· 486 486 return ret; 487 487 } 488 488 489 - struct pci_bus *pci_v3_scan_bus(int nr, struct pci_sys_data *sys) 489 + struct pci_bus * __init pci_v3_scan_bus(int nr, struct pci_sys_data *sys) 490 490 { 491 491 return pci_scan_bus(sys->busnr, &pci_v3_ops, sys); 492 492 }

-2

arch/arm/mach-iop32x/include/mach/iop32x.h

··· 31 31 #define IOP32X_MAX_RAM_SIZE 0x40000000UL 32 32 #define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE 33 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 35 #endif

-2

arch/arm/mach-iop33x/include/mach/iop33x.h

··· 36 36 #define IOP33X_MAX_RAM_SIZE 0x80000000UL 37 37 #define IOP3XX_MAX_RAM_SIZE IOP33X_MAX_RAM_SIZE 38 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 41 #endif

-5

arch/arm/mach-sa1100/Kconfig

··· 71 71 <http://www.handhelds.org/Compaq/index.html#iPAQ_H3600> 72 72 <http://www.compaq.com/products/handhelds/pocketpc/> 73 73 74 - config SA1100_H3XXX 75 - bool 76 - depends on SA1100_H3100 || SA1100_H3600 77 - default y 78 - 79 74 config SA1100_BADGE4 80 75 bool "HP Labs BadgePAD 4" 81 76 select SA1111

+1 -1

arch/arm/mach-sa1100/time.c

··· 77 77 .set_mode = sa1100_osmr0_set_mode, 78 78 }; 79 79 80 - static cycle_t sa1100_read_oscr(void) 80 + static cycle_t sa1100_read_oscr(struct clocksource *s) 81 81 { 82 82 return OSCR; 83 83 }

+10

arch/arm/mach-u300/gpio.c

··· 281 281 } 282 282 EXPORT_SYMBOL(gpio_unregister_callback); 283 283 284 + /* Non-zero means valid */ 285 + int 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 + } 292 + EXPORT_SYMBOL(gpio_is_valid); 293 + 284 294 int gpio_request(unsigned gpio, const char *label) 285 295 { 286 296 if (gpio_pin[gpio].users)

+1

arch/arm/mach-u300/include/mach/gpio.h

··· 258 258 #define PIN_TO_PORT(val) (val >> 3) 259 259 260 260 /* These can be found in arch/arm/mach-u300/gpio.c */ 261 + extern int gpio_is_valid(int number); 261 262 extern int gpio_request(unsigned gpio, const char *label); 262 263 extern void gpio_free(unsigned gpio); 263 264 extern int gpio_direction_input(unsigned gpio);

+30 -27

arch/arm/mm/Kconfig

··· 17 17 select CPU_CP15_MMU 18 18 select CPU_COPY_V3 if MMU 19 19 select CPU_TLB_V3 if MMU 20 - select CPU_PABRT_NOIFAR 20 + select CPU_PABRT_LEGACY 21 21 help 22 22 The ARM610 is the successor to the ARM3 processor 23 23 and was produced by VLSI Technology Inc. ··· 31 31 depends on !MMU 32 32 select CPU_32v4T 33 33 select CPU_ABRT_LV4T 34 - select CPU_PABRT_NOIFAR 34 + select CPU_PABRT_LEGACY 35 35 select CPU_CACHE_V4 36 36 help 37 37 A 32-bit RISC microprocessor based on the ARM7 processor core ··· 49 49 select CPU_CP15_MMU 50 50 select CPU_COPY_V3 if MMU 51 51 select CPU_TLB_V3 if MMU 52 - select CPU_PABRT_NOIFAR 52 + select CPU_PABRT_LEGACY 53 53 help 54 54 A 32-bit RISC microprocessor based on the ARM7 processor core 55 55 designed by Advanced RISC Machines Ltd. The ARM710 is the ··· 64 64 bool "Support ARM720T processor" if ARCH_INTEGRATOR 65 65 select CPU_32v4T 66 66 select CPU_ABRT_LV4T 67 - select CPU_PABRT_NOIFAR 67 + select CPU_PABRT_LEGACY 68 68 select CPU_CACHE_V4 69 69 select CPU_CACHE_VIVT 70 70 select CPU_CP15_MMU ··· 83 83 depends on !MMU 84 84 select CPU_32v4T 85 85 select CPU_ABRT_LV4T 86 - select CPU_PABRT_NOIFAR 86 + select CPU_PABRT_LEGACY 87 87 select CPU_CACHE_V3 # although the core is v4t 88 88 select CPU_CP15_MPU 89 89 help ··· 100 100 depends on !MMU 101 101 select CPU_32v4T 102 102 select CPU_ABRT_NOMMU 103 - select CPU_PABRT_NOIFAR 103 + select CPU_PABRT_LEGACY 104 104 select CPU_CACHE_V4 105 105 help 106 106 A 32-bit RISC microprocessor based on the ARM9 processor core ··· 114 114 bool "Support ARM920T processor" if ARCH_INTEGRATOR 115 115 select CPU_32v4T 116 116 select CPU_ABRT_EV4T 117 - select CPU_PABRT_NOIFAR 117 + select CPU_PABRT_LEGACY 118 118 select CPU_CACHE_V4WT 119 119 select CPU_CACHE_VIVT 120 120 select CPU_CP15_MMU ··· 135 135 bool "Support ARM922T processor" if ARCH_INTEGRATOR 136 136 select CPU_32v4T 137 137 select CPU_ABRT_EV4T 138 - select CPU_PABRT_NOIFAR 138 + select CPU_PABRT_LEGACY 139 139 select CPU_CACHE_V4WT 140 140 select CPU_CACHE_VIVT 141 141 select CPU_CP15_MMU ··· 154 154 bool "Support ARM925T processor" if ARCH_OMAP1 155 155 select CPU_32v4T 156 156 select CPU_ABRT_EV4T 157 - select CPU_PABRT_NOIFAR 157 + select CPU_PABRT_LEGACY 158 158 select CPU_CACHE_V4WT 159 159 select CPU_CACHE_VIVT 160 160 select CPU_CP15_MMU ··· 173 173 bool "Support ARM926T processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB 174 174 select CPU_32v5 175 175 select CPU_ABRT_EV5TJ 176 - select CPU_PABRT_NOIFAR 176 + select CPU_PABRT_LEGACY 177 177 select CPU_CACHE_VIVT 178 178 select CPU_CP15_MMU 179 179 select CPU_COPY_V4WB if MMU ··· 191 191 bool 192 192 select CPU_32v4 193 193 select CPU_ABRT_EV4 194 - select CPU_PABRT_NOIFAR 194 + select CPU_PABRT_LEGACY 195 195 select CPU_CACHE_VIVT 196 196 select CPU_CP15_MMU 197 197 select CPU_CACHE_FA ··· 210 210 depends on !MMU 211 211 select CPU_32v4T 212 212 select CPU_ABRT_NOMMU 213 - select CPU_PABRT_NOIFAR 213 + select CPU_PABRT_LEGACY 214 214 select CPU_CACHE_VIVT 215 215 select CPU_CP15_MPU 216 216 help ··· 228 228 depends on !MMU 229 229 select CPU_32v5 230 230 select CPU_ABRT_NOMMU 231 - select CPU_PABRT_NOIFAR 231 + select CPU_PABRT_LEGACY 232 232 select CPU_CACHE_VIVT 233 233 select CPU_CP15_MPU 234 234 help ··· 244 244 bool "Support ARM1020T (rev 0) processor" if ARCH_INTEGRATOR 245 245 select CPU_32v5 246 246 select CPU_ABRT_EV4T 247 - select CPU_PABRT_NOIFAR 247 + select CPU_PABRT_LEGACY 248 248 select CPU_CACHE_V4WT 249 249 select CPU_CACHE_VIVT 250 250 select CPU_CP15_MMU ··· 262 262 bool "Support ARM1020E processor" if ARCH_INTEGRATOR 263 263 select CPU_32v5 264 264 select CPU_ABRT_EV4T 265 - select CPU_PABRT_NOIFAR 265 + select CPU_PABRT_LEGACY 266 266 select CPU_CACHE_V4WT 267 267 select CPU_CACHE_VIVT 268 268 select CPU_CP15_MMU ··· 275 275 bool "Support ARM1022E processor" if ARCH_INTEGRATOR 276 276 select CPU_32v5 277 277 select CPU_ABRT_EV4T 278 - select CPU_PABRT_NOIFAR 278 + select CPU_PABRT_LEGACY 279 279 select CPU_CACHE_VIVT 280 280 select CPU_CP15_MMU 281 281 select CPU_COPY_V4WB if MMU # can probably do better ··· 293 293 bool "Support ARM1026EJ-S processor" if ARCH_INTEGRATOR 294 294 select CPU_32v5 295 295 select CPU_ABRT_EV5T # But need Jazelle, but EV5TJ ignores bit 10 296 - select CPU_PABRT_NOIFAR 296 + select CPU_PABRT_LEGACY 297 297 select CPU_CACHE_VIVT 298 298 select CPU_CP15_MMU 299 299 select CPU_COPY_V4WB if MMU # can probably do better ··· 311 311 select CPU_32v3 if ARCH_RPC 312 312 select CPU_32v4 if !ARCH_RPC 313 313 select CPU_ABRT_EV4 314 - select CPU_PABRT_NOIFAR 314 + select CPU_PABRT_LEGACY 315 315 select CPU_CACHE_V4WB 316 316 select CPU_CACHE_VIVT 317 317 select CPU_CP15_MMU ··· 331 331 bool 332 332 select CPU_32v4 333 333 select CPU_ABRT_EV4 334 - select CPU_PABRT_NOIFAR 334 + select CPU_PABRT_LEGACY 335 335 select CPU_CACHE_V4WB 336 336 select CPU_CACHE_VIVT 337 337 select CPU_CP15_MMU ··· 342 342 bool 343 343 select CPU_32v5 344 344 select CPU_ABRT_EV5T 345 - select CPU_PABRT_NOIFAR 345 + select CPU_PABRT_LEGACY 346 346 select CPU_CACHE_VIVT 347 347 select CPU_CP15_MMU 348 348 select CPU_TLB_V4WBI if MMU ··· 352 352 bool 353 353 select CPU_32v5 354 354 select CPU_ABRT_EV5T 355 - select CPU_PABRT_NOIFAR 355 + select CPU_PABRT_LEGACY 356 356 select CPU_CACHE_VIVT 357 357 select CPU_CP15_MMU 358 358 select CPU_TLB_V4WBI if MMU ··· 363 363 bool 364 364 select CPU_32v5 365 365 select CPU_ABRT_EV5T 366 - select CPU_PABRT_NOIFAR 366 + select CPU_PABRT_LEGACY 367 367 select CPU_CACHE_VIVT 368 368 select CPU_CP15_MMU 369 369 select CPU_TLB_V4WBI if MMU ··· 374 374 bool 375 375 select CPU_32v5 376 376 select CPU_ABRT_EV5T 377 - select CPU_PABRT_NOIFAR 377 + select CPU_PABRT_LEGACY 378 378 select CPU_CACHE_VIVT 379 379 select CPU_CP15_MMU 380 380 select CPU_COPY_FEROCEON if MMU ··· 394 394 bool "Support ARM V6 processor" if ARCH_INTEGRATOR || MACH_REALVIEW_EB || MACH_REALVIEW_PBX 395 395 select CPU_32v6 396 396 select CPU_ABRT_EV6 397 - select CPU_PABRT_NOIFAR 397 + select CPU_PABRT_V6 398 398 select CPU_CACHE_V6 399 399 select CPU_CACHE_VIPT 400 400 select CPU_CP15_MMU ··· 420 420 select CPU_32v6K 421 421 select CPU_32v7 422 422 select CPU_ABRT_EV7 423 - select CPU_PABRT_IFAR 423 + select CPU_PABRT_V7 424 424 select CPU_CACHE_V7 425 425 select CPU_CACHE_VIPT 426 426 select CPU_CP15_MMU ··· 482 482 config CPU_ABRT_EV7 483 483 bool 484 484 485 - config CPU_PABRT_IFAR 485 + config CPU_PABRT_LEGACY 486 486 bool 487 487 488 - config CPU_PABRT_NOIFAR 488 + config CPU_PABRT_V6 489 + bool 490 + 491 + config CPU_PABRT_V7 489 492 bool 490 493 491 494 # The cache model

+4

arch/arm/mm/Makefile

··· 27 27 obj-$(CONFIG_CPU_ABRT_EV6) += abort-ev6.o 28 28 obj-$(CONFIG_CPU_ABRT_EV7) += abort-ev7.o 29 29 30 + obj-$(CONFIG_CPU_PABRT_LEGACY) += pabort-legacy.o 31 + obj-$(CONFIG_CPU_PABRT_V6) += pabort-v6.o 32 + obj-$(CONFIG_CPU_PABRT_V7) += pabort-v7.o 33 + 30 34 obj-$(CONFIG_CPU_CACHE_V3) += cache-v3.o 31 35 obj-$(CONFIG_CPU_CACHE_V4) += cache-v4.o 32 36 obj-$(CONFIG_CPU_CACHE_V4WT) += cache-v4wt.o

+51 -2

arch/arm/mm/fault.c

··· 519 519 arm_notify_die("", regs, &info, fsr, 0); 520 520 } 521 521 522 + 523 + static 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 + 522 558 asmlinkage void __exception 523 - do_PrefetchAbort(unsigned long addr, struct pt_regs *regs) 559 + do_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

+1 -1

arch/arm/mm/mmap.c

··· 124 124 { 125 125 if (addr < PHYS_OFFSET) 126 126 return 0; 127 - if (addr + size >= __pa(high_memory - 1)) 127 + if (addr + size > __pa(high_memory - 1) + 1) 128 128 return 0; 129 129 130 130 return 1;

+35 -4

arch/arm/mm/mmu.c

··· 21 21 #include <asm/cachetype.h> 22 22 #include <asm/setup.h> 23 23 #include <asm/sizes.h> 24 + #include <asm/smp_plat.h> 24 25 #include <asm/tlb.h> 25 26 #include <asm/highmem.h> 26 27 ··· 710 709 if (meminfo.nr_banks >= NR_BANKS) { 711 710 printk(KERN_CRIT "NR_BANKS too low, " 712 711 "ignoring high memory\n"); 713 - } else if (cache_is_vipt_aliasing()) { 714 - printk(KERN_CRIT "HIGHMEM is not yet supported " 715 - "with VIPT aliasing cache, " 716 - "ignoring high memory\n"); 717 712 } else { 718 713 memmove(bank + 1, bank, 719 714 (meminfo.nr_banks - i) * sizeof(*bank)); ··· 723 726 bank->size = VMALLOC_MIN - __va(bank->start); 724 727 } 725 728 #else 729 + bank->highmem = highmem; 730 + 726 731 /* 727 732 * Check whether this memory bank would entirely overlap 728 733 * the vmalloc area. ··· 753 754 #endif 754 755 j++; 755 756 } 757 + #ifdef CONFIG_HIGHMEM 758 + if (highmem) { 759 + const char *reason = NULL; 760 + 761 + if (cache_is_vipt_aliasing()) { 762 + /* 763 + * Interactions between kmap and other mappings 764 + * make highmem support with aliasing VIPT caches 765 + * rather difficult. 766 + */ 767 + reason = "with VIPT aliasing cache"; 768 + #ifdef CONFIG_SMP 769 + } else if (tlb_ops_need_broadcast()) { 770 + /* 771 + * kmap_high needs to occasionally flush TLB entries, 772 + * however, if the TLB entries need to be broadcast 773 + * we may deadlock: 774 + * kmap_high(irqs off)->flush_all_zero_pkmaps-> 775 + * flush_tlb_kernel_range->smp_call_function_many 776 + * (must not be called with irqs off) 777 + */ 778 + reason = "without hardware TLB ops broadcasting"; 779 + #endif 780 + } 781 + if (reason) { 782 + printk(KERN_CRIT "HIGHMEM is not supported %s, ignoring high memory\n", 783 + reason); 784 + while (j > 0 && meminfo.bank[j - 1].highmem) 785 + j--; 786 + } 787 + } 788 + #endif 756 789 meminfo.nr_banks = j; 757 790 } 758 791

+19

arch/arm/mm/pabort-legacy.S

··· 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 16 + ENTRY(legacy_pabort) 17 + mov r1, #5 18 + mov pc, lr 19 + ENDPROC(legacy_pabort)

+19

arch/arm/mm/pabort-v6.S

··· 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 16 + ENTRY(v6_pabort) 17 + mrc p15, 0, r1, c5, c0, 1 @ get IFSR 18 + mov pc, lr 19 + ENDPROC(v6_pabort)

+20

arch/arm/mm/pabort-v7.S

··· 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 16 + ENTRY(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 20 + ENDPROC(v7_pabort)

+1 -1

arch/arm/mm/proc-arm1020.S

··· 449 449 .type arm1020_processor_functions, #object 450 450 arm1020_processor_functions: 451 451 .word v4t_early_abort 452 - .word pabort_noifar 452 + .word legacy_pabort 453 453 .word cpu_arm1020_proc_init 454 454 .word cpu_arm1020_proc_fin 455 455 .word cpu_arm1020_reset

+1 -1

arch/arm/mm/proc-arm1020e.S

··· 430 430 .type arm1020e_processor_functions, #object 431 431 arm1020e_processor_functions: 432 432 .word v4t_early_abort 433 - .word pabort_noifar 433 + .word legacy_pabort 434 434 .word cpu_arm1020e_proc_init 435 435 .word cpu_arm1020e_proc_fin 436 436 .word cpu_arm1020e_reset

+1 -1

arch/arm/mm/proc-arm1022.S

··· 413 413 .type arm1022_processor_functions, #object 414 414 arm1022_processor_functions: 415 415 .word v4t_early_abort 416 - .word pabort_noifar 416 + .word legacy_pabort 417 417 .word cpu_arm1022_proc_init 418 418 .word cpu_arm1022_proc_fin 419 419 .word cpu_arm1022_reset

+1 -1

arch/arm/mm/proc-arm1026.S

··· 408 408 .type arm1026_processor_functions, #object 409 409 arm1026_processor_functions: 410 410 .word v5t_early_abort 411 - .word pabort_noifar 411 + .word legacy_pabort 412 412 .word cpu_arm1026_proc_init 413 413 .word cpu_arm1026_proc_fin 414 414 .word cpu_arm1026_reset

+2 -2

arch/arm/mm/proc-arm6_7.S

··· 278 278 .type arm6_processor_functions, #object 279 279 ENTRY(arm6_processor_functions) 280 280 .word cpu_arm6_data_abort 281 - .word pabort_noifar 281 + .word legacy_pabort 282 282 .word cpu_arm6_proc_init 283 283 .word cpu_arm6_proc_fin 284 284 .word cpu_arm6_reset ··· 295 295 .type arm7_processor_functions, #object 296 296 ENTRY(arm7_processor_functions) 297 297 .word cpu_arm7_data_abort 298 - .word pabort_noifar 298 + .word legacy_pabort 299 299 .word cpu_arm7_proc_init 300 300 .word cpu_arm7_proc_fin 301 301 .word cpu_arm7_reset

+1 -1

arch/arm/mm/proc-arm720.S

··· 181 181 .type arm720_processor_functions, #object 182 182 ENTRY(arm720_processor_functions) 183 183 .word v4t_late_abort 184 - .word pabort_noifar 184 + .word legacy_pabort 185 185 .word cpu_arm720_proc_init 186 186 .word cpu_arm720_proc_fin 187 187 .word cpu_arm720_reset

+1 -1

arch/arm/mm/proc-arm740.S

··· 126 126 .type arm740_processor_functions, #object 127 127 ENTRY(arm740_processor_functions) 128 128 .word v4t_late_abort 129 - .word pabort_noifar 129 + .word legacy_pabort 130 130 .word cpu_arm740_proc_init 131 131 .word cpu_arm740_proc_fin 132 132 .word cpu_arm740_reset

+1 -1

arch/arm/mm/proc-arm7tdmi.S

··· 64 64 .type arm7tdmi_processor_functions, #object 65 65 ENTRY(arm7tdmi_processor_functions) 66 66 .word v4t_late_abort 67 - .word pabort_noifar 67 + .word legacy_pabort 68 68 .word cpu_arm7tdmi_proc_init 69 69 .word cpu_arm7tdmi_proc_fin 70 70 .word cpu_arm7tdmi_reset

+1 -1

arch/arm/mm/proc-arm920.S

··· 395 395 .type arm920_processor_functions, #object 396 396 arm920_processor_functions: 397 397 .word v4t_early_abort 398 - .word pabort_noifar 398 + .word legacy_pabort 399 399 .word cpu_arm920_proc_init 400 400 .word cpu_arm920_proc_fin 401 401 .word cpu_arm920_reset

+1 -1

arch/arm/mm/proc-arm922.S

··· 399 399 .type arm922_processor_functions, #object 400 400 arm922_processor_functions: 401 401 .word v4t_early_abort 402 - .word pabort_noifar 402 + .word legacy_pabort 403 403 .word cpu_arm922_proc_init 404 404 .word cpu_arm922_proc_fin 405 405 .word cpu_arm922_reset

+1 -1

arch/arm/mm/proc-arm925.S

··· 462 462 .type arm925_processor_functions, #object 463 463 arm925_processor_functions: 464 464 .word v4t_early_abort 465 - .word pabort_noifar 465 + .word legacy_pabort 466 466 .word cpu_arm925_proc_init 467 467 .word cpu_arm925_proc_fin 468 468 .word cpu_arm925_reset

+1 -1

arch/arm/mm/proc-arm926.S

··· 415 415 .type arm926_processor_functions, #object 416 416 arm926_processor_functions: 417 417 .word v5tj_early_abort 418 - .word pabort_noifar 418 + .word legacy_pabort 419 419 .word cpu_arm926_proc_init 420 420 .word cpu_arm926_proc_fin 421 421 .word cpu_arm926_reset

+1 -1

arch/arm/mm/proc-arm940.S

··· 322 322 .type arm940_processor_functions, #object 323 323 ENTRY(arm940_processor_functions) 324 324 .word nommu_early_abort 325 - .word pabort_noifar 325 + .word legacy_pabort 326 326 .word cpu_arm940_proc_init 327 327 .word cpu_arm940_proc_fin 328 328 .word cpu_arm940_reset

+1 -1

arch/arm/mm/proc-arm946.S

··· 377 377 .type arm946_processor_functions, #object 378 378 ENTRY(arm946_processor_functions) 379 379 .word nommu_early_abort 380 - .word pabort_noifar 380 + .word legacy_pabort 381 381 .word cpu_arm946_proc_init 382 382 .word cpu_arm946_proc_fin 383 383 .word cpu_arm946_reset

+1 -1

arch/arm/mm/proc-arm9tdmi.S

··· 64 64 .type arm9tdmi_processor_functions, #object 65 65 ENTRY(arm9tdmi_processor_functions) 66 66 .word nommu_early_abort 67 - .word pabort_noifar 67 + .word legacy_pabort 68 68 .word cpu_arm9tdmi_proc_init 69 69 .word cpu_arm9tdmi_proc_fin 70 70 .word cpu_arm9tdmi_reset

+1 -1

arch/arm/mm/proc-fa526.S

··· 191 191 .type fa526_processor_functions, #object 192 192 fa526_processor_functions: 193 193 .word v4_early_abort 194 - .word pabort_noifar 194 + .word legacy_pabort 195 195 .word cpu_fa526_proc_init 196 196 .word cpu_fa526_proc_fin 197 197 .word cpu_fa526_reset

+1 -1

arch/arm/mm/proc-feroceon.S

··· 499 499 .type feroceon_processor_functions, #object 500 500 feroceon_processor_functions: 501 501 .word v5t_early_abort 502 - .word pabort_noifar 502 + .word legacy_pabort 503 503 .word cpu_feroceon_proc_init 504 504 .word cpu_feroceon_proc_fin 505 505 .word cpu_feroceon_reset

+1 -1

arch/arm/mm/proc-mohawk.S

··· 359 359 .type mohawk_processor_functions, #object 360 360 mohawk_processor_functions: 361 361 .word v5t_early_abort 362 - .word pabort_noifar 362 + .word legacy_pabort 363 363 .word cpu_mohawk_proc_init 364 364 .word cpu_mohawk_proc_fin 365 365 .word cpu_mohawk_reset

+1 -1

arch/arm/mm/proc-sa110.S

··· 199 199 .type sa110_processor_functions, #object 200 200 ENTRY(sa110_processor_functions) 201 201 .word v4_early_abort 202 - .word pabort_noifar 202 + .word legacy_pabort 203 203 .word cpu_sa110_proc_init 204 204 .word cpu_sa110_proc_fin 205 205 .word cpu_sa110_reset

+1 -1

arch/arm/mm/proc-sa1100.S

··· 214 214 .type sa1100_processor_functions, #object 215 215 ENTRY(sa1100_processor_functions) 216 216 .word v4_early_abort 217 - .word pabort_noifar 217 + .word legacy_pabort 218 218 .word cpu_sa1100_proc_init 219 219 .word cpu_sa1100_proc_fin 220 220 .word cpu_sa1100_reset

+1 -1

arch/arm/mm/proc-v6.S

··· 191 191 .type v6_processor_functions, #object 192 192 ENTRY(v6_processor_functions) 193 193 .word v6_early_abort 194 - .word pabort_noifar 194 + .word v6_pabort 195 195 .word cpu_v6_proc_init 196 196 .word cpu_v6_proc_fin 197 197 .word cpu_v6_reset

+1 -1

arch/arm/mm/proc-v7.S

··· 295 295 .type v7_processor_functions, #object 296 296 ENTRY(v7_processor_functions) 297 297 .word v7_early_abort 298 - .word pabort_ifar 298 + .word v7_pabort 299 299 .word cpu_v7_proc_init 300 300 .word cpu_v7_proc_fin 301 301 .word cpu_v7_reset

+1 -1

arch/arm/mm/proc-xsc3.S

··· 428 428 .type xsc3_processor_functions, #object 429 429 ENTRY(xsc3_processor_functions) 430 430 .word v5t_early_abort 431 - .word pabort_noifar 431 + .word legacy_pabort 432 432 .word cpu_xsc3_proc_init 433 433 .word cpu_xsc3_proc_fin 434 434 .word cpu_xsc3_reset

+1 -1

arch/arm/mm/proc-xscale.S

··· 511 511 .type xscale_processor_functions, #object 512 512 ENTRY(xscale_processor_functions) 513 513 .word v5t_early_abort 514 - .word pabort_noifar 514 + .word legacy_pabort 515 515 .word cpu_xscale_proc_init 516 516 .word cpu_xscale_proc_fin 517 517 .word cpu_xscale_reset

+2 -1

arch/arm/plat-iop/pci.c

··· 257 257 *IOP3XX_OUMWTVR0 = 0; 258 258 259 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 262 *IOP3XX_OUMWTVR1 = 0; 262 263 263 264 /* BAR 3 ( Disabled ) */

+1 -1

arch/arm/plat-iop/time.c

··· 85 85 { 86 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 89 ticks_per_usec = tick_rate / 1000000; 90 90 next_jiffy_time = 0xffffffff; 91 91 iop_tick_rate = tick_rate;

-2

drivers/mmc/host/mmci.c

··· 678 678 writel(0, host->base + MMCIMASK1); 679 679 writel(0xfff, host->base + MMCICLEAR); 680 680 681 - #ifdef CONFIG_GPIOLIB 682 681 if (gpio_is_valid(plat->gpio_cd)) { 683 682 ret = gpio_request(plat->gpio_cd, DRIVER_NAME " (cd)"); 684 683 if (ret == 0) ··· 696 697 else if (ret != -ENOSYS) 697 698 goto err_gpio_wp; 698 699 } 699 - #endif 700 700 701 701 ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host); 702 702 if (ret)

+1 -1

drivers/pcmcia/sa1100_assabet.c

··· 130 130 .socket_suspend = assabet_pcmcia_socket_suspend, 131 131 }; 132 132 133 - int __init pcmcia_assabet_init(struct device *dev) 133 + int pcmcia_assabet_init(struct device *dev) 134 134 { 135 135 int ret = -ENODEV; 136 136

+1 -1

drivers/pcmcia/sa1100_neponset.c

··· 123 123 .socket_suspend = sa1111_pcmcia_socket_suspend, 124 124 }; 125 125 126 - int __init pcmcia_neponset_init(struct sa1111_dev *sadev) 126 + int pcmcia_neponset_init(struct sa1111_dev *sadev) 127 127 { 128 128 int ret = -ENODEV; 129 129

+1 -1

drivers/serial/sa1100.c

··· 638 638 PPSR |= PPC_TXD1 | PPC_TXD3; 639 639 } 640 640 641 - void __init sa1100_register_uart_fns(struct sa1100_port_fns *fns) 641 + void __devinit sa1100_register_uart_fns(struct sa1100_port_fns *fns) 642 642 { 643 643 if (fns->get_mctrl) 644 644 sa1100_pops.get_mctrl = fns->get_mctrl;

Configure Feed

Configure Feed