tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Update defconfig.
sparc64: Fix lmb_reserve() args in find_ramdisk().

Linus Torvalds 20a24989 9a6ab769

+32 -10
unified split
+31 -9
arch/sparc64/defconfig
··· 1 1 # 2 2 # Automatically generated make config: don't edit 3 - # Linux kernel version: 2.6.25 4 - # Sat Apr 26 03:11:06 2008 3 + # Linux kernel version: 2.6.26-rc2 4 + # Fri May 16 13:36:07 2008 5 5 # 6 6 CONFIG_SPARC=y 7 7 CONFIG_SPARC64=y ··· 74 74 # CONFIG_EMBEDDED is not set 75 75 CONFIG_UID16=y 76 76 CONFIG_SYSCTL_SYSCALL=y 77 + CONFIG_SYSCTL_SYSCALL_CHECK=y 77 78 CONFIG_KALLSYMS=y 78 79 # CONFIG_KALLSYMS_ALL is not set 79 80 # CONFIG_KALLSYMS_EXTRA_PASS is not set ··· 104 103 CONFIG_KRETPROBES=y 105 104 CONFIG_HAVE_KPROBES=y 106 105 CONFIG_HAVE_KRETPROBES=y 106 + # CONFIG_HAVE_DMA_ATTRS is not set 107 107 CONFIG_PROC_PAGE_MONITOR=y 108 108 CONFIG_SLABINFO=y 109 109 CONFIG_RT_MUTEXES=y 110 110 # CONFIG_TINY_SHMEM is not set 111 111 CONFIG_BASE_SMALL=0 112 112 CONFIG_MODULES=y 113 + # CONFIG_MODULE_FORCE_LOAD is not set 113 114 CONFIG_MODULE_UNLOAD=y 114 115 CONFIG_MODULE_FORCE_UNLOAD=y 115 116 CONFIG_MODVERSIONS=y ··· 173 170 CONFIG_SPARSEMEM_EXTREME=y 174 171 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y 175 172 CONFIG_SPARSEMEM_VMEMMAP=y 173 + CONFIG_PAGEFLAGS_EXTENDED=y 176 174 CONFIG_SPLIT_PTLOCK_CPUS=4 177 175 CONFIG_MIGRATION=y 178 176 CONFIG_RESOURCES_64BIT=y ··· 406 402 CONFIG_BLK_DEV_IDEDMA_PCI=y 407 403 # CONFIG_BLK_DEV_AEC62XX is not set 408 404 CONFIG_BLK_DEV_ALI15X3=y 409 - # CONFIG_WDC_ALI15X3 is not set 410 405 # CONFIG_BLK_DEV_AMD74XX is not set 411 406 # CONFIG_BLK_DEV_CMD64X is not set 412 407 # CONFIG_BLK_DEV_TRIFLEX is not set ··· 612 609 # CONFIG_MLX4_CORE is not set 613 610 # CONFIG_TEHUTI is not set 614 611 # CONFIG_BNX2X is not set 612 + # CONFIG_SFC is not set 615 613 # CONFIG_TR is not set 616 614 617 615 # ··· 721 717 CONFIG_VT_CONSOLE=y 722 718 CONFIG_HW_CONSOLE=y 723 719 # CONFIG_VT_HW_CONSOLE_BINDING is not set 720 + # CONFIG_DEVKMEM is not set 724 721 # CONFIG_SERIAL_NONSTANDARD is not set 725 722 # CONFIG_NOZOMI is not set 726 723 ··· 798 793 # CONFIG_I2C_DEBUG_ALGO is not set 799 794 # CONFIG_I2C_DEBUG_BUS is not set 800 795 # CONFIG_I2C_DEBUG_CHIP is not set 801 - 802 - # 803 - # SPI support 804 - # 805 796 # CONFIG_SPI is not set 806 - # CONFIG_SPI_MASTER is not set 807 797 # CONFIG_W1 is not set 808 798 # CONFIG_POWER_SUPPLY is not set 809 799 CONFIG_HWMON=y ··· 873 873 # 874 874 # Multimedia devices 875 875 # 876 + 877 + # 878 + # Multimedia core support 879 + # 876 880 # CONFIG_VIDEO_DEV is not set 877 881 # CONFIG_DVB_CORE is not set 882 + # CONFIG_VIDEO_MEDIA is not set 883 + 884 + # 885 + # Multimedia drivers 886 + # 878 887 # CONFIG_DAB is not set 879 888 880 889 # ··· 902 893 # CONFIG_FB_SYS_FILLRECT is not set 903 894 # CONFIG_FB_SYS_COPYAREA is not set 904 895 # CONFIG_FB_SYS_IMAGEBLIT is not set 896 + # CONFIG_FB_FOREIGN_ENDIAN is not set 905 897 # CONFIG_FB_SYS_FOPS is not set 906 - CONFIG_FB_DEFERRED_IO=y 907 898 # CONFIG_FB_SVGALIB is not set 908 899 # CONFIG_FB_MACMODES is not set 909 900 # CONFIG_FB_BACKLIGHT is not set ··· 1109 1100 # 1110 1101 1111 1102 # 1103 + # SoC Audio for the Texas Instruments OMAP 1104 + # 1105 + 1106 + # 1112 1107 # Open Sound System 1113 1108 # 1114 1109 # CONFIG_SOUND_PRIME is not set ··· 1148 1135 # 1149 1136 # USB Host Controller Drivers 1150 1137 # 1138 + # CONFIG_USB_C67X00_HCD is not set 1151 1139 CONFIG_USB_EHCI_HCD=m 1152 1140 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1153 1141 # CONFIG_USB_EHCI_TT_NEWSCHED is not set 1154 1142 # CONFIG_USB_ISP116X_HCD is not set 1143 + # CONFIG_USB_ISP1760_HCD is not set 1155 1144 CONFIG_USB_OHCI_HCD=y 1156 1145 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1157 1146 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set ··· 1188 1173 # CONFIG_USB_STORAGE_ALAUDA is not set 1189 1174 # CONFIG_USB_STORAGE_ONETOUCH is not set 1190 1175 # CONFIG_USB_STORAGE_KARMA is not set 1176 + # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set 1191 1177 # CONFIG_USB_LIBUSUAL is not set 1192 1178 1193 1179 # ··· 1230 1214 # CONFIG_MMC is not set 1231 1215 # CONFIG_MEMSTICK is not set 1232 1216 # CONFIG_NEW_LEDS is not set 1217 + # CONFIG_ACCESSIBILITY is not set 1233 1218 # CONFIG_INFINIBAND is not set 1234 1219 # CONFIG_RTC_CLASS is not set 1235 1220 # CONFIG_UIO is not set ··· 1384 1367 CONFIG_PRINTK_TIME=y 1385 1368 # CONFIG_ENABLE_WARN_DEPRECATED is not set 1386 1369 CONFIG_ENABLE_MUST_CHECK=y 1370 + CONFIG_FRAME_WARN=2048 1387 1371 CONFIG_MAGIC_SYSRQ=y 1388 1372 # CONFIG_UNUSED_SYMBOLS is not set 1389 1373 CONFIG_DEBUG_FS=y ··· 1395 1377 # CONFIG_SCHED_DEBUG is not set 1396 1378 CONFIG_SCHEDSTATS=y 1397 1379 # CONFIG_TIMER_STATS is not set 1380 + # CONFIG_DEBUG_OBJECTS is not set 1398 1381 # CONFIG_SLUB_DEBUG_ON is not set 1399 1382 # CONFIG_SLUB_STATS is not set 1400 1383 # CONFIG_DEBUG_RT_MUTEXES is not set ··· 1421 1402 # CONFIG_LKDTM is not set 1422 1403 # CONFIG_FAULT_INJECTION is not set 1423 1404 # CONFIG_SAMPLES is not set 1405 + CONFIG_HAVE_ARCH_KGDB=y 1406 + # CONFIG_KGDB is not set 1424 1407 # CONFIG_DEBUG_STACK_USAGE is not set 1425 1408 # CONFIG_DEBUG_DCFLUSH is not set 1426 1409 # CONFIG_STACK_DEBUG is not set ··· 1524 1503 # Library routines 1525 1504 # 1526 1505 CONFIG_BITREVERSE=y 1506 + # CONFIG_GENERIC_FIND_FIRST_BIT is not set 1527 1507 CONFIG_CRC_CCITT=m 1528 1508 CONFIG_CRC16=m 1529 1509 # CONFIG_CRC_ITU_T is not set
+1 -1
arch/sparc64/mm/init.c
··· 768 768 initrd_start = ramdisk_image; 769 769 initrd_end = ramdisk_image + sparc_ramdisk_size; 770 770 771 - lmb_reserve(initrd_start, initrd_end); 771 + lmb_reserve(initrd_start, sparc_ramdisk_size); 772 772 773 773 initrd_start += PAGE_OFFSET; 774 774 initrd_end += PAGE_OFFSET;