Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: fix interrupt state restore
microblaze: Defconfig update

+175 -48
+87 -25
arch/microblaze/configs/mmu_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.31 4 - # Thu Sep 24 10:28:50 2009 3 + # Linux kernel version: 2.6.33-rc6 4 + # Wed Feb 3 10:02:59 2010 5 5 # 6 6 CONFIG_MICROBLAZE=y 7 7 # CONFIG_SWAP is not set ··· 19 19 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 20 20 CONFIG_GENERIC_GPIO=y 21 21 CONFIG_GENERIC_CSUM=y 22 + CONFIG_STACKTRACE_SUPPORT=y 23 + CONFIG_LOCKDEP_SUPPORT=y 24 + CONFIG_HAVE_LATENCYTOP_SUPPORT=y 22 25 # CONFIG_PCI is not set 23 26 CONFIG_NO_DMA=y 27 + CONFIG_DTC=y 24 28 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 25 29 CONFIG_CONSTRUCTORS=y 26 30 ··· 48 44 # 49 45 CONFIG_TREE_RCU=y 50 46 # CONFIG_TREE_PREEMPT_RCU is not set 47 + # CONFIG_TINY_RCU is not set 51 48 # CONFIG_RCU_TRACE is not set 52 49 CONFIG_RCU_FANOUT=32 53 50 # CONFIG_RCU_FANOUT_EXACT is not set ··· 69 64 CONFIG_RD_GZIP=y 70 65 # CONFIG_RD_BZIP2 is not set 71 66 # CONFIG_RD_LZMA is not set 67 + # CONFIG_RD_LZO is not set 72 68 # CONFIG_INITRAMFS_COMPRESSION_NONE is not set 73 69 CONFIG_INITRAMFS_COMPRESSION_GZIP=y 74 70 # CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set 75 71 # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set 72 + # CONFIG_INITRAMFS_COMPRESSION_LZO is not set 76 73 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 77 74 CONFIG_SYSCTL=y 78 75 CONFIG_ANON_INODES=y ··· 97 90 CONFIG_AIO=y 98 91 99 92 # 100 - # Performance Counters 93 + # Kernel Performance Events And Counters 101 94 # 102 95 CONFIG_VM_EVENT_COUNTERS=y 103 - # CONFIG_STRIP_ASM_SYMS is not set 104 96 CONFIG_COMPAT_BRK=y 105 97 CONFIG_SLAB=y 106 98 # CONFIG_SLUB is not set 107 99 # CONFIG_SLOB is not set 108 100 # CONFIG_PROFILING is not set 109 - # CONFIG_MARKERS is not set 101 + CONFIG_HAVE_OPROFILE=y 110 102 111 103 # 112 104 # GCOV-based kernel profiling 113 105 # 114 - # CONFIG_SLOW_WORK is not set 106 + CONFIG_SLOW_WORK=y 115 107 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 116 108 CONFIG_SLABINFO=y 117 109 CONFIG_BASE_SMALL=1 ··· 129 123 # IO Schedulers 130 124 # 131 125 CONFIG_IOSCHED_NOOP=y 132 - CONFIG_IOSCHED_AS=y 133 126 CONFIG_IOSCHED_DEADLINE=y 134 127 CONFIG_IOSCHED_CFQ=y 135 - # CONFIG_DEFAULT_AS is not set 136 128 # CONFIG_DEFAULT_DEADLINE is not set 137 129 CONFIG_DEFAULT_CFQ=y 138 130 # CONFIG_DEFAULT_NOOP is not set 139 131 CONFIG_DEFAULT_IOSCHED="cfq" 132 + # CONFIG_INLINE_SPIN_TRYLOCK is not set 133 + # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set 134 + # CONFIG_INLINE_SPIN_LOCK is not set 135 + # CONFIG_INLINE_SPIN_LOCK_BH is not set 136 + # CONFIG_INLINE_SPIN_LOCK_IRQ is not set 137 + # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set 138 + # CONFIG_INLINE_SPIN_UNLOCK is not set 139 + # CONFIG_INLINE_SPIN_UNLOCK_BH is not set 140 + # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set 141 + # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set 142 + # CONFIG_INLINE_READ_TRYLOCK is not set 143 + # CONFIG_INLINE_READ_LOCK is not set 144 + # CONFIG_INLINE_READ_LOCK_BH is not set 145 + # CONFIG_INLINE_READ_LOCK_IRQ is not set 146 + # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set 147 + # CONFIG_INLINE_READ_UNLOCK is not set 148 + # CONFIG_INLINE_READ_UNLOCK_BH is not set 149 + # CONFIG_INLINE_READ_UNLOCK_IRQ is not set 150 + # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set 151 + # CONFIG_INLINE_WRITE_TRYLOCK is not set 152 + # CONFIG_INLINE_WRITE_LOCK is not set 153 + # CONFIG_INLINE_WRITE_LOCK_BH is not set 154 + # CONFIG_INLINE_WRITE_LOCK_IRQ is not set 155 + # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set 156 + # CONFIG_INLINE_WRITE_UNLOCK is not set 157 + # CONFIG_INLINE_WRITE_UNLOCK_BH is not set 158 + # CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set 159 + # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set 160 + # CONFIG_MUTEX_SPIN_ON_OWNER is not set 140 161 # CONFIG_FREEZER is not set 141 162 142 163 # ··· 172 139 CONFIG_PLATFORM_GENERIC=y 173 140 CONFIG_OPT_LIB_FUNCTION=y 174 141 CONFIG_OPT_LIB_ASM=y 175 - CONFIG_ALLOW_EDIT_AUTO=y 176 - 177 - # 178 - # Automatic platform settings from Kconfig.auto 179 - # 180 142 181 143 # 182 144 # Definitions for MICROBLAZE0 ··· 231 203 CONFIG_FLATMEM=y 232 204 CONFIG_FLAT_NODE_MEM_MAP=y 233 205 CONFIG_PAGEFLAGS_EXTENDED=y 234 - CONFIG_SPLIT_PTLOCK_CPUS=4 206 + CONFIG_SPLIT_PTLOCK_CPUS=999999 235 207 # CONFIG_PHYS_ADDR_T_64BIT is not set 236 208 CONFIG_ZONE_DMA_FLAG=0 237 209 CONFIG_VIRT_TO_BUS=y 238 - CONFIG_HAVE_MLOCK=y 239 - CONFIG_HAVE_MLOCKED_PAGE_BIT=y 210 + # CONFIG_KSM is not set 240 211 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 241 212 242 213 # ··· 316 289 # CONFIG_IRDA is not set 317 290 # CONFIG_BT is not set 318 291 # CONFIG_AF_RXRPC is not set 319 - # CONFIG_WIRELESS is not set 292 + CONFIG_WIRELESS=y 293 + # CONFIG_CFG80211 is not set 294 + # CONFIG_LIB80211 is not set 295 + 296 + # 297 + # CFG80211 needs to be enabled for MAC80211 298 + # 320 299 # CONFIG_WIMAX is not set 321 300 # CONFIG_RFKILL is not set 322 301 # CONFIG_NET_9P is not set ··· 346 313 CONFIG_BLK_DEV=y 347 314 # CONFIG_BLK_DEV_COW_COMMON is not set 348 315 # CONFIG_BLK_DEV_LOOP is not set 316 + 317 + # 318 + # DRBD disabled because PROC_FS, INET or CONNECTOR not selected 319 + # 349 320 # CONFIG_BLK_DEV_NBD is not set 350 321 CONFIG_BLK_DEV_RAM=y 351 322 CONFIG_BLK_DEV_RAM_COUNT=16 ··· 386 349 # CONFIG_PHYLIB is not set 387 350 CONFIG_NET_ETHERNET=y 388 351 # CONFIG_MII is not set 389 - # CONFIG_ETHOC is not set 390 352 # CONFIG_DNET is not set 391 353 # CONFIG_IBM_NEW_EMAC_ZMII is not set 392 354 # CONFIG_IBM_NEW_EMAC_RGMII is not set ··· 395 359 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 396 360 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 397 361 # CONFIG_KS8842 is not set 362 + # CONFIG_KS8851_MLL is not set 398 363 CONFIG_XILINX_EMACLITE=y 399 364 CONFIG_NETDEV_1000=y 400 365 CONFIG_NETDEV_10000=y 401 366 CONFIG_WLAN=y 402 - # CONFIG_WLAN_PRE80211 is not set 403 - # CONFIG_WLAN_80211 is not set 367 + # CONFIG_HOSTAP is not set 404 368 405 369 # 406 370 # Enable WiMAX (Networking options) to see the WiMAX drivers ··· 444 408 CONFIG_SERIAL_UARTLITE_CONSOLE=y 445 409 CONFIG_SERIAL_CORE=y 446 410 CONFIG_SERIAL_CORE_CONSOLE=y 411 + # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 447 412 CONFIG_UNIX98_PTYS=y 448 413 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 449 414 CONFIG_LEGACY_PTYS=y ··· 470 433 # CONFIG_POWER_SUPPLY is not set 471 434 # CONFIG_HWMON is not set 472 435 # CONFIG_THERMAL is not set 473 - # CONFIG_THERMAL_HWMON is not set 474 436 # CONFIG_WATCHDOG is not set 475 437 476 438 # ··· 562 526 CONFIG_PROC_SYSCTL=y 563 527 CONFIG_PROC_PAGE_MONITOR=y 564 528 CONFIG_SYSFS=y 565 - CONFIG_TMPFS=y 566 - # CONFIG_TMPFS_POSIX_ACL is not set 567 529 # CONFIG_HUGETLB_PAGE is not set 568 530 # CONFIG_CONFIGFS_FS is not set 569 531 CONFIG_MISC_FILESYSTEMS=y ··· 672 638 # 673 639 # Kernel hacking 674 640 # 641 + CONFIG_TRACE_IRQFLAGS_SUPPORT=y 675 642 # CONFIG_PRINTK_TIME is not set 676 643 CONFIG_ENABLE_WARN_DEPRECATED=y 677 644 CONFIG_ENABLE_MUST_CHECK=y 678 645 CONFIG_FRAME_WARN=1024 679 646 # CONFIG_MAGIC_SYSRQ is not set 647 + # CONFIG_STRIP_ASM_SYMS is not set 680 648 # CONFIG_UNUSED_SYMBOLS is not set 681 649 # CONFIG_DEBUG_FS is not set 682 650 # CONFIG_HEADERS_CHECK is not set ··· 698 662 # CONFIG_DEBUG_SLAB_LEAK is not set 699 663 CONFIG_DEBUG_SPINLOCK=y 700 664 # CONFIG_DEBUG_MUTEXES is not set 665 + # CONFIG_DEBUG_LOCK_ALLOC is not set 666 + # CONFIG_PROVE_LOCKING is not set 667 + # CONFIG_LOCK_STAT is not set 701 668 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set 702 669 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 703 670 # CONFIG_DEBUG_KOBJECT is not set ··· 719 680 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 720 681 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 721 682 # CONFIG_FAULT_INJECTION is not set 683 + # CONFIG_LATENCYTOP is not set 722 684 # CONFIG_SYSCTL_SYSCALL_CHECK is not set 723 685 # CONFIG_PAGE_POISONING is not set 686 + CONFIG_HAVE_FUNCTION_TRACER=y 687 + CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 688 + CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 689 + CONFIG_HAVE_DYNAMIC_FTRACE=y 690 + CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 691 + CONFIG_TRACING_SUPPORT=y 692 + CONFIG_FTRACE=y 693 + # CONFIG_FUNCTION_TRACER is not set 694 + # CONFIG_IRQSOFF_TRACER is not set 695 + # CONFIG_SCHED_TRACER is not set 696 + # CONFIG_ENABLE_DEFAULT_TRACERS is not set 697 + # CONFIG_BOOT_TRACER is not set 698 + CONFIG_BRANCH_PROFILE_NONE=y 699 + # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 700 + # CONFIG_PROFILE_ALL_BRANCHES is not set 701 + # CONFIG_STACK_TRACER is not set 702 + # CONFIG_KMEMTRACE is not set 703 + # CONFIG_WORKQUEUE_TRACER is not set 704 + # CONFIG_BLK_DEV_IO_TRACE is not set 724 705 # CONFIG_SAMPLES is not set 725 - # CONFIG_KMEMCHECK is not set 726 706 CONFIG_EARLY_PRINTK=y 727 707 # CONFIG_HEART_BEAT is not set 728 708 CONFIG_DEBUG_BOOTMEM=y ··· 752 694 # CONFIG_KEYS is not set 753 695 # CONFIG_SECURITY is not set 754 696 # CONFIG_SECURITYFS is not set 755 - # CONFIG_SECURITY_FILE_CAPABILITIES is not set 697 + # CONFIG_DEFAULT_SECURITY_SELINUX is not set 698 + # CONFIG_DEFAULT_SECURITY_SMACK is not set 699 + # CONFIG_DEFAULT_SECURITY_TOMOYO is not set 700 + CONFIG_DEFAULT_SECURITY_DAC=y 701 + CONFIG_DEFAULT_SECURITY="" 756 702 CONFIG_CRYPTO=y 757 703 758 704 #
+82 -19
arch/microblaze/configs/nommu_defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.31 4 - # Thu Sep 24 10:29:43 2009 3 + # Linux kernel version: 2.6.33-rc6 4 + # Wed Feb 3 10:03:21 2010 5 5 # 6 6 CONFIG_MICROBLAZE=y 7 7 # CONFIG_SWAP is not set ··· 19 19 CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 20 20 CONFIG_GENERIC_GPIO=y 21 21 CONFIG_GENERIC_CSUM=y 22 + CONFIG_STACKTRACE_SUPPORT=y 23 + CONFIG_LOCKDEP_SUPPORT=y 24 + CONFIG_HAVE_LATENCYTOP_SUPPORT=y 22 25 # CONFIG_PCI is not set 23 26 CONFIG_NO_DMA=y 27 + CONFIG_DTC=y 24 28 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 25 29 CONFIG_CONSTRUCTORS=y 26 30 ··· 50 46 # 51 47 CONFIG_TREE_RCU=y 52 48 # CONFIG_TREE_PREEMPT_RCU is not set 49 + # CONFIG_TINY_RCU is not set 53 50 # CONFIG_RCU_TRACE is not set 54 51 CONFIG_RCU_FANOUT=32 55 52 # CONFIG_RCU_FANOUT_EXACT is not set ··· 86 81 CONFIG_AIO=y 87 82 88 83 # 89 - # Performance Counters 84 + # Kernel Performance Events And Counters 90 85 # 91 86 CONFIG_VM_EVENT_COUNTERS=y 92 - # CONFIG_STRIP_ASM_SYMS is not set 93 87 CONFIG_COMPAT_BRK=y 94 88 CONFIG_SLAB=y 95 89 # CONFIG_SLUB is not set 96 90 # CONFIG_SLOB is not set 91 + # CONFIG_MMAP_ALLOW_UNINITIALIZED is not set 97 92 # CONFIG_PROFILING is not set 98 - # CONFIG_MARKERS is not set 93 + CONFIG_HAVE_OPROFILE=y 99 94 100 95 # 101 96 # GCOV-based kernel profiling ··· 121 116 # IO Schedulers 122 117 # 123 118 CONFIG_IOSCHED_NOOP=y 124 - CONFIG_IOSCHED_AS=y 125 119 CONFIG_IOSCHED_DEADLINE=y 126 120 CONFIG_IOSCHED_CFQ=y 127 - # CONFIG_DEFAULT_AS is not set 128 121 # CONFIG_DEFAULT_DEADLINE is not set 129 122 CONFIG_DEFAULT_CFQ=y 130 123 # CONFIG_DEFAULT_NOOP is not set 131 124 CONFIG_DEFAULT_IOSCHED="cfq" 125 + # CONFIG_INLINE_SPIN_TRYLOCK is not set 126 + # CONFIG_INLINE_SPIN_TRYLOCK_BH is not set 127 + # CONFIG_INLINE_SPIN_LOCK is not set 128 + # CONFIG_INLINE_SPIN_LOCK_BH is not set 129 + # CONFIG_INLINE_SPIN_LOCK_IRQ is not set 130 + # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set 131 + CONFIG_INLINE_SPIN_UNLOCK=y 132 + # CONFIG_INLINE_SPIN_UNLOCK_BH is not set 133 + CONFIG_INLINE_SPIN_UNLOCK_IRQ=y 134 + # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set 135 + # CONFIG_INLINE_READ_TRYLOCK is not set 136 + # CONFIG_INLINE_READ_LOCK is not set 137 + # CONFIG_INLINE_READ_LOCK_BH is not set 138 + # CONFIG_INLINE_READ_LOCK_IRQ is not set 139 + # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set 140 + CONFIG_INLINE_READ_UNLOCK=y 141 + # CONFIG_INLINE_READ_UNLOCK_BH is not set 142 + CONFIG_INLINE_READ_UNLOCK_IRQ=y 143 + # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set 144 + # CONFIG_INLINE_WRITE_TRYLOCK is not set 145 + # CONFIG_INLINE_WRITE_LOCK is not set 146 + # CONFIG_INLINE_WRITE_LOCK_BH is not set 147 + # CONFIG_INLINE_WRITE_LOCK_IRQ is not set 148 + # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set 149 + CONFIG_INLINE_WRITE_UNLOCK=y 150 + # CONFIG_INLINE_WRITE_UNLOCK_BH is not set 151 + CONFIG_INLINE_WRITE_UNLOCK_IRQ=y 152 + # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set 153 + # CONFIG_MUTEX_SPIN_ON_OWNER is not set 132 154 # CONFIG_FREEZER is not set 133 155 134 156 # ··· 164 132 CONFIG_PLATFORM_GENERIC=y 165 133 # CONFIG_SELFMOD is not set 166 134 # CONFIG_OPT_LIB_FUNCTION is not set 167 - # CONFIG_ALLOW_EDIT_AUTO is not set 135 + 136 + # 137 + # Definitions for MICROBLAZE0 138 + # 168 139 CONFIG_KERNEL_BASE_ADDR=0x90000000 169 140 CONFIG_XILINX_MICROBLAZE0_FAMILY="virtex5" 170 141 CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 ··· 225 190 # CONFIG_PHYS_ADDR_T_64BIT is not set 226 191 CONFIG_ZONE_DMA_FLAG=0 227 192 CONFIG_VIRT_TO_BUS=y 228 - CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 229 193 CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1 230 194 231 195 # ··· 308 274 # CONFIG_AF_RXRPC is not set 309 275 CONFIG_WIRELESS=y 310 276 # CONFIG_CFG80211 is not set 311 - CONFIG_CFG80211_DEFAULT_PS_VALUE=0 312 - CONFIG_WIRELESS_OLD_REGULATORY=y 313 - # CONFIG_WIRELESS_EXT is not set 314 277 # CONFIG_LIB80211 is not set 315 278 316 279 # ··· 332 301 # CONFIG_CONNECTOR is not set 333 302 CONFIG_MTD=y 334 303 # CONFIG_MTD_DEBUG is not set 304 + # CONFIG_MTD_TESTS is not set 335 305 CONFIG_MTD_CONCAT=y 336 306 CONFIG_MTD_PARTITIONS=y 337 - # CONFIG_MTD_TESTS is not set 338 307 # CONFIG_MTD_REDBOOT_PARTS is not set 339 308 CONFIG_MTD_CMDLINE_PARTS=y 340 309 # CONFIG_MTD_OF_PARTS is not set ··· 418 387 CONFIG_BLK_DEV=y 419 388 # CONFIG_BLK_DEV_COW_COMMON is not set 420 389 # CONFIG_BLK_DEV_LOOP is not set 390 + 391 + # 392 + # DRBD disabled because PROC_FS, INET or CONNECTOR not selected 393 + # 421 394 CONFIG_BLK_DEV_NBD=y 422 395 CONFIG_BLK_DEV_RAM=y 423 396 CONFIG_BLK_DEV_RAM_COUNT=16 ··· 458 423 # CONFIG_PHYLIB is not set 459 424 CONFIG_NET_ETHERNET=y 460 425 # CONFIG_MII is not set 461 - # CONFIG_ETHOC is not set 462 426 # CONFIG_DNET is not set 463 427 # CONFIG_IBM_NEW_EMAC_ZMII is not set 464 428 # CONFIG_IBM_NEW_EMAC_RGMII is not set ··· 467 433 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 468 434 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 469 435 # CONFIG_KS8842 is not set 436 + # CONFIG_KS8851_MLL is not set 470 437 # CONFIG_XILINX_EMACLITE is not set 471 438 CONFIG_NETDEV_1000=y 472 439 CONFIG_NETDEV_10000=y 473 440 CONFIG_WLAN=y 474 - # CONFIG_WLAN_PRE80211 is not set 475 - # CONFIG_WLAN_80211 is not set 441 + # CONFIG_HOSTAP is not set 476 442 477 443 # 478 444 # Enable WiMAX (Networking options) to see the WiMAX drivers ··· 516 482 CONFIG_SERIAL_UARTLITE_CONSOLE=y 517 483 CONFIG_SERIAL_CORE=y 518 484 CONFIG_SERIAL_CORE_CONSOLE=y 485 + # CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set 519 486 CONFIG_UNIX98_PTYS=y 520 487 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 521 488 CONFIG_LEGACY_PTYS=y ··· 543 508 # CONFIG_POWER_SUPPLY is not set 544 509 # CONFIG_HWMON is not set 545 510 # CONFIG_THERMAL is not set 546 - # CONFIG_THERMAL_HWMON is not set 547 511 # CONFIG_WATCHDOG is not set 548 512 549 513 # ··· 650 616 CONFIG_PROC_FS=y 651 617 CONFIG_PROC_SYSCTL=y 652 618 CONFIG_SYSFS=y 653 - # CONFIG_TMPFS is not set 654 619 # CONFIG_HUGETLB_PAGE is not set 655 620 # CONFIG_CONFIGFS_FS is not set 656 621 CONFIG_MISC_FILESYSTEMS=y ··· 705 672 # 706 673 # Kernel hacking 707 674 # 675 + CONFIG_TRACE_IRQFLAGS_SUPPORT=y 708 676 # CONFIG_PRINTK_TIME is not set 709 677 CONFIG_ENABLE_WARN_DEPRECATED=y 710 678 CONFIG_ENABLE_MUST_CHECK=y 711 679 CONFIG_FRAME_WARN=1024 712 680 # CONFIG_MAGIC_SYSRQ is not set 681 + # CONFIG_STRIP_ASM_SYMS is not set 713 682 CONFIG_UNUSED_SYMBOLS=y 714 683 CONFIG_DEBUG_FS=y 715 684 # CONFIG_HEADERS_CHECK is not set ··· 730 695 CONFIG_DEBUG_OBJECTS_SELFTEST=y 731 696 CONFIG_DEBUG_OBJECTS_FREE=y 732 697 CONFIG_DEBUG_OBJECTS_TIMERS=y 698 + # CONFIG_DEBUG_OBJECTS_WORK is not set 733 699 CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 734 700 # CONFIG_DEBUG_SLAB is not set 735 701 # CONFIG_DEBUG_RT_MUTEXES is not set 736 702 # CONFIG_RT_MUTEX_TESTER is not set 737 703 # CONFIG_DEBUG_SPINLOCK is not set 738 704 # CONFIG_DEBUG_MUTEXES is not set 705 + # CONFIG_DEBUG_LOCK_ALLOC is not set 706 + # CONFIG_PROVE_LOCKING is not set 707 + # CONFIG_LOCK_STAT is not set 739 708 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set 740 709 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 741 710 # CONFIG_DEBUG_KOBJECT is not set ··· 759 720 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set 760 721 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set 761 722 # CONFIG_FAULT_INJECTION is not set 723 + # CONFIG_LATENCYTOP is not set 762 724 CONFIG_SYSCTL_SYSCALL_CHECK=y 763 725 # CONFIG_PAGE_POISONING is not set 726 + CONFIG_HAVE_FUNCTION_TRACER=y 727 + CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y 728 + CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y 729 + CONFIG_HAVE_DYNAMIC_FTRACE=y 730 + CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 731 + CONFIG_TRACING_SUPPORT=y 732 + CONFIG_FTRACE=y 733 + # CONFIG_FUNCTION_TRACER is not set 734 + # CONFIG_IRQSOFF_TRACER is not set 735 + # CONFIG_SCHED_TRACER is not set 736 + # CONFIG_ENABLE_DEFAULT_TRACERS is not set 737 + # CONFIG_BOOT_TRACER is not set 738 + CONFIG_BRANCH_PROFILE_NONE=y 739 + # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set 740 + # CONFIG_PROFILE_ALL_BRANCHES is not set 741 + # CONFIG_STACK_TRACER is not set 742 + # CONFIG_KMEMTRACE is not set 743 + # CONFIG_WORKQUEUE_TRACER is not set 744 + # CONFIG_BLK_DEV_IO_TRACE is not set 764 745 # CONFIG_DYNAMIC_DEBUG is not set 765 746 # CONFIG_SAMPLES is not set 766 747 CONFIG_EARLY_PRINTK=y ··· 793 734 # CONFIG_KEYS is not set 794 735 # CONFIG_SECURITY is not set 795 736 # CONFIG_SECURITYFS is not set 796 - # CONFIG_SECURITY_FILE_CAPABILITIES is not set 737 + # CONFIG_DEFAULT_SECURITY_SELINUX is not set 738 + # CONFIG_DEFAULT_SECURITY_SMACK is not set 739 + # CONFIG_DEFAULT_SECURITY_TOMOYO is not set 740 + CONFIG_DEFAULT_SECURITY_DAC=y 741 + CONFIG_DEFAULT_SECURITY="" 797 742 CONFIG_CRYPTO=y 798 743 799 744 #
+6 -4
arch/microblaze/kernel/entry-nommu.S
··· 122 122 123 123 ret_from_intr: 124 124 lwi r11, r1, PT_MODE 125 - bneid r11, 3f 125 + bneid r11, no_intr_resched 126 126 127 127 lwi r6, r31, TS_THREAD_INFO /* get thread info */ 128 128 lwi r19, r6, TI_FLAGS /* get flags in thread info */ ··· 133 133 bralid r15, schedule 134 134 nop 135 135 1: andi r11, r19, _TIF_SIGPENDING 136 - beqid r11, no_intr_reshed 136 + beqid r11, no_intr_resched 137 137 addk r5, r1, r0 138 138 addk r7, r0, r0 139 139 bralid r15, do_signal 140 140 addk r6, r0, r0 141 141 142 - no_intr_reshed: 142 + no_intr_resched: 143 + /* Disable interrupts, we are now committed to the state restore */ 144 + disable_irq 145 + 143 146 /* save mode indicator */ 144 147 lwi r11, r1, PT_MODE 145 - 3: 146 148 swi r11, r0, PER_CPU(KM) 147 149 148 150 /* save r31 */