Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 279e677faa775ad16e75c32e1bf4a37f8158bc61

Authored by Linus Torvalds
2 parents 467999f50c 7b7210d7a9
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix kind-of-intr checking against number of interrupts
  microblaze: Update Microblaze defconfig

Showing 2 changed files Side-by-side Diff

arch/microblaze/configs/nommu_defconfig
Diff comments   View file @ 279e677
1 1 #
2 2 # Automatically generated make config: don't edit
3   -# Linux kernel version: 2.6.29
4   -# Tue Mar 24 10:23:20 2009
  3 +# Linux kernel version: 2.6.30-rc5
  4 +# Mon May 11 09:01:02 2009
5 5 #
6 6 CONFIG_MICROBLAZE=y
7 7 # CONFIG_SWAP is not set
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_SYSVIPC=y
33 33 CONFIG_SYSVIPC_SYSCTL=y
34 34 CONFIG_POSIX_MQUEUE=y
  35 +CONFIG_POSIX_MQUEUE_SYSCTL=y
35 36 CONFIG_BSD_PROCESS_ACCT=y
36 37 CONFIG_BSD_PROCESS_ACCT_V3=y
37 38 # CONFIG_TASKSTATS is not set
... ... @@ -63,6 +64,7 @@
63 64 CONFIG_KALLSYMS=y
64 65 CONFIG_KALLSYMS_ALL=y
65 66 CONFIG_KALLSYMS_EXTRA_PASS=y
  67 +# CONFIG_STRIP_ASM_SYMS is not set
66 68 # CONFIG_HOTPLUG is not set
67 69 CONFIG_PRINTK=y
68 70 CONFIG_BUG=y
... ... @@ -80,6 +82,8 @@
80 82 # CONFIG_SLUB is not set
81 83 # CONFIG_SLOB is not set
82 84 # CONFIG_PROFILING is not set
  85 +# CONFIG_MARKERS is not set
  86 +# CONFIG_SLOW_WORK is not set
83 87 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
84 88 CONFIG_SLABINFO=y
85 89 CONFIG_RT_MUTEXES=y
... ... @@ -92,7 +96,6 @@
92 96 # CONFIG_MODULE_SRCVERSION_ALL is not set
93 97 CONFIG_BLOCK=y
94 98 # CONFIG_LBD is not set
95   -# CONFIG_BLK_DEV_IO_TRACE is not set
96 99 # CONFIG_BLK_DEV_BSG is not set
97 100 # CONFIG_BLK_DEV_INTEGRITY is not set
98 101  
... ... @@ -166,6 +169,8 @@
166 169 # CONFIG_PHYS_ADDR_T_64BIT is not set
167 170 CONFIG_ZONE_DMA_FLAG=0
168 171 CONFIG_VIRT_TO_BUS=y
  172 +CONFIG_UNEVICTABLE_LRU=y
  173 +CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
169 174  
170 175 #
171 176 # Exectuable file formats
... ... @@ -180,7 +185,6 @@
180 185 #
181 186 # Networking options
182 187 #
183   -CONFIG_COMPAT_NET_DEV_OPS=y
184 188 CONFIG_PACKET=y
185 189 # CONFIG_PACKET_MMAP is not set
186 190 CONFIG_UNIX=y
... ... @@ -232,6 +236,7 @@
232 236 # CONFIG_LAPB is not set
233 237 # CONFIG_ECONET is not set
234 238 # CONFIG_WAN_ROUTER is not set
  239 +# CONFIG_PHONET is not set
235 240 # CONFIG_NET_SCHED is not set
236 241 # CONFIG_DCB is not set
237 242  
... ... @@ -244,7 +249,6 @@
244 249 # CONFIG_IRDA is not set
245 250 # CONFIG_BT is not set
246 251 # CONFIG_AF_RXRPC is not set
247   -# CONFIG_PHONET is not set
248 252 CONFIG_WIRELESS=y
249 253 # CONFIG_CFG80211 is not set
250 254 CONFIG_WIRELESS_OLD_REGULATORY=y
... ... @@ -379,6 +383,7 @@
379 383 # CONFIG_ATA is not set
380 384 # CONFIG_MD is not set
381 385 CONFIG_NETDEVICES=y
  386 +CONFIG_COMPAT_NET_DEV_OPS=y
382 387 # CONFIG_DUMMY is not set
383 388 # CONFIG_BONDING is not set
384 389 # CONFIG_MACVLAN is not set
... ... @@ -388,6 +393,7 @@
388 393 # CONFIG_PHYLIB is not set
389 394 CONFIG_NET_ETHERNET=y
390 395 # CONFIG_MII is not set
  396 +# CONFIG_ETHOC is not set
391 397 # CONFIG_DNET is not set
392 398 # CONFIG_IBM_NEW_EMAC_ZMII is not set
393 399 # CONFIG_IBM_NEW_EMAC_RGMII is not set
... ... @@ -405,7 +411,6 @@
405 411 #
406 412 # CONFIG_WLAN_PRE80211 is not set
407 413 # CONFIG_WLAN_80211 is not set
408   -# CONFIG_IWLWIFI_LEDS is not set
409 414  
410 415 #
411 416 # Enable WiMAX (Networking options) to see the WiMAX drivers
... ... @@ -455,6 +460,7 @@
455 460 CONFIG_LEGACY_PTY_COUNT=256
456 461 # CONFIG_IPMI_HANDLER is not set
457 462 CONFIG_HW_RANDOM=y
  463 +# CONFIG_HW_RANDOM_TIMERIOMEM is not set
458 464 # CONFIG_RTC is not set
459 465 # CONFIG_GEN_RTC is not set
460 466 # CONFIG_R3964 is not set
... ... @@ -525,7 +531,7 @@
525 531 #
526 532  
527 533 #
528   -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
  534 +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
529 535 #
530 536 # CONFIG_USB_GADGET is not set
531 537  
... ... @@ -538,6 +544,7 @@
538 544 # CONFIG_ACCESSIBILITY is not set
539 545 # CONFIG_RTC_CLASS is not set
540 546 # CONFIG_DMADEVICES is not set
  547 +# CONFIG_AUXDISPLAY is not set
541 548 # CONFIG_UIO is not set
542 549 # CONFIG_STAGING is not set
543 550  
... ... @@ -563,6 +570,11 @@
563 570 # CONFIG_FUSE_FS is not set
564 571  
565 572 #
  573 +# Caches
  574 +#
  575 +# CONFIG_FSCACHE is not set
  576 +
  577 +#
566 578 # CD-ROM/DVD Filesystems
567 579 #
568 580 # CONFIG_ISO9660_FS is not set
569 581  
... ... @@ -601,8 +613,13 @@
601 613 # CONFIG_HPFS_FS is not set
602 614 # CONFIG_QNX4FS_FS is not set
603 615 CONFIG_ROMFS_FS=y
  616 +CONFIG_ROMFS_BACKED_BY_BLOCK=y
  617 +# CONFIG_ROMFS_BACKED_BY_MTD is not set
  618 +# CONFIG_ROMFS_BACKED_BY_BOTH is not set
  619 +CONFIG_ROMFS_ON_BLOCK=y
604 620 # CONFIG_SYSV_FS is not set
605 621 # CONFIG_UFS_FS is not set
  622 +# CONFIG_NILFS2_FS is not set
606 623 CONFIG_NETWORK_FILESYSTEMS=y
607 624 CONFIG_NFS_FS=y
608 625 CONFIG_NFS_V3=y
... ... @@ -614,7 +631,6 @@
614 631 CONFIG_NFS_ACL_SUPPORT=y
615 632 CONFIG_NFS_COMMON=y
616 633 CONFIG_SUNRPC=y
617   -# CONFIG_SUNRPC_REGISTER_V4 is not set
618 634 # CONFIG_RPCSEC_GSS_KRB5 is not set
619 635 # CONFIG_RPCSEC_GSS_SPKM3 is not set
620 636 # CONFIG_SMB_FS is not set
... ... @@ -647,6 +663,9 @@
647 663 CONFIG_DETECT_SOFTLOCKUP=y
648 664 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
649 665 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
  666 +CONFIG_DETECT_HUNG_TASK=y
  667 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
  668 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
650 669 CONFIG_SCHED_DEBUG=y
651 670 CONFIG_SCHEDSTATS=y
652 671 CONFIG_TIMER_STATS=y
... ... @@ -678,15 +697,8 @@
678 697 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
679 698 # CONFIG_FAULT_INJECTION is not set
680 699 CONFIG_SYSCTL_SYSCALL_CHECK=y
681   -
682   -#
683   -# Tracers
684   -#
685   -# CONFIG_SCHED_TRACER is not set
686   -# CONFIG_CONTEXT_SWITCH_TRACER is not set
687   -# CONFIG_BOOT_TRACER is not set
688   -# CONFIG_TRACE_BRANCH_PROFILING is not set
689   -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
  700 +# CONFIG_PAGE_POISONING is not set
  701 +# CONFIG_DYNAMIC_DEBUG is not set
690 702 # CONFIG_SAMPLES is not set
691 703 CONFIG_EARLY_PRINTK=y
692 704 CONFIG_HEART_BEAT=y
... ... @@ -777,6 +789,7 @@
777 789 # Compression
778 790 #
779 791 # CONFIG_CRYPTO_DEFLATE is not set
  792 +# CONFIG_CRYPTO_ZLIB is not set
780 793 # CONFIG_CRYPTO_LZO is not set
781 794  
782 795 #
... ... @@ -784,6 +797,7 @@
784 797 #
785 798 # CONFIG_CRYPTO_ANSI_CPRNG is not set
786 799 CONFIG_CRYPTO_HW=y
  800 +# CONFIG_BINARY_PRINTF is not set
787 801  
788 802 #
789 803 # Library routines
790 804  
... ... @@ -797,9 +811,9 @@
797 811 # CONFIG_CRC7 is not set
798 812 # CONFIG_LIBCRC32C is not set
799 813 CONFIG_ZLIB_INFLATE=y
800   -CONFIG_PLIST=y
801 814 CONFIG_HAS_IOMEM=y
802 815 CONFIG_HAS_IOPORT=y
803 816 CONFIG_HAS_DMA=y
804 817 CONFIG_HAVE_LMB=y
  818 +CONFIG_NLATTR=y
arch/microblaze/kernel/intc.c
Diff comments   View file @ 279e677
... ... @@ -137,8 +137,8 @@
137 137  
138 138 intr_type =
139 139 *(int *) of_get_property(intc, "xlnx,kind-of-intr", NULL);
140   - if (intr_type >= (1 << nr_irq))
141   - printk(KERN_INFO " ERROR: Mishmash in king-of-intr param\n");
  140 + if (intr_type >= (1 << (nr_irq + 1)))
  141 + printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
142 142  
143 143 #ifdef CONFIG_SELFMOD_INTC
144 144 selfmod_function((int *) arr_func, intc_baseaddr);