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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parsic fixes from Helge Deller:
"There are just two small fixes in here:
- Revert a commit which exported the flush_cache_page function. This
was noticed by Christoph Hellwig.
- Enable the DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD config
options in the parisc defconfigs so that latest udev/initrd finds
the root disk at boot"

* 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: enable DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD in defconfigs
Revert "parisc: Export flush_cache_page() (needed by lustre)"

Linus Torvalds 0df651a0 31d141e3

+14 -1
+2
arch/parisc/configs/712_defconfig
··· 40 40 CONFIG_LLC2=m 41 41 CONFIG_NET_PKTGEN=m 42 42 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 43 + CONFIG_DEVTMPFS=y 44 + CONFIG_DEVTMPFS_MOUNT=y 43 45 # CONFIG_STANDALONE is not set 44 46 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 45 47 CONFIG_PARPORT=y
+2
arch/parisc/configs/a500_defconfig
··· 79 79 CONFIG_LLC2=m 80 80 CONFIG_NET_PKTGEN=m 81 81 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 82 + CONFIG_DEVTMPFS=y 83 + CONFIG_DEVTMPFS_MOUNT=y 82 84 # CONFIG_STANDALONE is not set 83 85 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 84 86 CONFIG_BLK_DEV_UMEM=m
+3
arch/parisc/configs/b180_defconfig
··· 4 4 CONFIG_IKCONFIG_PROC=y 5 5 CONFIG_LOG_BUF_SHIFT=16 6 6 CONFIG_SYSFS_DEPRECATED_V2=y 7 + CONFIG_BLK_DEV_INITRD=y 7 8 CONFIG_SLAB=y 8 9 CONFIG_MODULES=y 9 10 CONFIG_MODVERSIONS=y ··· 28 27 # CONFIG_INET_LRO is not set 29 28 CONFIG_IPV6=y 30 29 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 + CONFIG_DEVTMPFS=y 31 + CONFIG_DEVTMPFS_MOUNT=y 31 32 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 32 33 CONFIG_PARPORT=y 33 34 CONFIG_PARPORT_PC=y
+3
arch/parisc/configs/c3000_defconfig
··· 5 5 CONFIG_IKCONFIG_PROC=y 6 6 CONFIG_LOG_BUF_SHIFT=16 7 7 CONFIG_SYSFS_DEPRECATED_V2=y 8 + CONFIG_BLK_DEV_INITRD=y 8 9 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 9 10 CONFIG_EXPERT=y 10 11 CONFIG_KALLSYMS_ALL=y ··· 40 39 CONFIG_IP_NF_QUEUE=m 41 40 CONFIG_NET_PKTGEN=m 42 41 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 42 + CONFIG_DEVTMPFS=y 43 + CONFIG_DEVTMPFS_MOUNT=y 43 44 # CONFIG_STANDALONE is not set 44 45 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 45 46 CONFIG_BLK_DEV_UMEM=m
+2
arch/parisc/configs/c8000_defconfig
··· 62 62 CONFIG_LLC2=m 63 63 CONFIG_DNS_RESOLVER=y 64 64 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 65 + CONFIG_DEVTMPFS=y 66 + CONFIG_DEVTMPFS_MOUNT=y 65 67 # CONFIG_STANDALONE is not set 66 68 CONFIG_PARPORT=y 67 69 CONFIG_PARPORT_PC=y
+2
arch/parisc/configs/default_defconfig
··· 49 49 CONFIG_INET6_IPCOMP=y 50 50 CONFIG_LLC2=m 51 51 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 52 + CONFIG_DEVTMPFS=y 53 + CONFIG_DEVTMPFS_MOUNT=y 52 54 # CONFIG_STANDALONE is not set 53 55 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 54 56 CONFIG_PARPORT=y
-1
arch/parisc/kernel/cache.c
··· 602 602 __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn)); 603 603 } 604 604 } 605 - EXPORT_SYMBOL_GPL(flush_cache_page); 606 605 607 606 #ifdef CONFIG_PARISC_TMPALIAS 608 607