Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0df651a0 authored Oct 20, 2013 by Linus Torvalds

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)"

parents 31d141e3 c1b14041

arch/parisc/configs/712_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ CONFIG_IP_NF_QUEUE=m
		CONFIG_LLC2=m
		CONFIG_NET_PKTGEN=m
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		# CONFIG_STANDALONE is not set
		# CONFIG_PREVENT_FIRMWARE_BUILD is not set
		CONFIG_PARPORT=y

arch/parisc/configs/a500_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,8 @@ CONFIG_IP_DCCP=m
		CONFIG_LLC2=m
		CONFIG_NET_PKTGEN=m
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		# CONFIG_STANDALONE is not set
		# CONFIG_PREVENT_FIRMWARE_BUILD is not set
		CONFIG_BLK_DEV_UMEM=m

arch/parisc/configs/b180_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		CONFIG_LOG_BUF_SHIFT=16
		CONFIG_SYSFS_DEPRECATED_V2=y
		CONFIG_BLK_DEV_INITRD=y
		CONFIG_SLAB=y
		CONFIG_MODULES=y
		CONFIG_MODVERSIONS=y
		@@ -27,6 +28,8 @@ CONFIG_IP_PNP_BOOTP=y
		# CONFIG_INET_LRO is not set
		CONFIG_IPV6=y
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		# CONFIG_PREVENT_FIRMWARE_BUILD is not set
		CONFIG_PARPORT=y
		CONFIG_PARPORT_PC=y

arch/parisc/configs/c3000_defconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ CONFIG_IKCONFIG=y
		CONFIG_IKCONFIG_PROC=y
		CONFIG_LOG_BUF_SHIFT=16
		CONFIG_SYSFS_DEPRECATED_V2=y
		CONFIG_BLK_DEV_INITRD=y
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		CONFIG_EXPERT=y
		CONFIG_KALLSYMS_ALL=y
		@@ -39,6 +40,8 @@ CONFIG_NETFILTER_DEBUG=y
		CONFIG_IP_NF_QUEUE=m
		CONFIG_NET_PKTGEN=m
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		# CONFIG_STANDALONE is not set
		# CONFIG_PREVENT_FIRMWARE_BUILD is not set
		CONFIG_BLK_DEV_UMEM=m

arch/parisc/configs/c8000_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@ CONFIG_TIPC=m
		CONFIG_LLC2=m
		CONFIG_DNS_RESOLVER=y
		CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
		CONFIG_DEVTMPFS=y
		CONFIG_DEVTMPFS_MOUNT=y
		# CONFIG_STANDALONE is not set
		CONFIG_PARPORT=y
		CONFIG_PARPORT_PC=y