[PATCH 1/4] ARM: shmobile: Disable /sbin/hotplug fork-bomb in defconfigs

[PATCH 1/4] ARM: shmobile: Disable /sbin/hotplug fork-bomb in defconfigs

[Geert Uytterhoeven]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Cfr. commit 7934779a69f1184f29d786b89e77dd14519bd226 ("Driver-Core: disable
/sbin/hotplug by default").

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
---
 arch/arm/configs/ape6evm_defconfig         |    1 -
 arch/arm/configs/armadillo800eva_defconfig |    1 -
 arch/arm/configs/bockw_defconfig           |    1 -
 arch/arm/configs/genmai_defconfig          |    1 -
 arch/arm/configs/koelsch_defconfig         |    1 -
 arch/arm/configs/kzm9d_defconfig           |    1 -
 arch/arm/configs/kzm9g_defconfig           |    1 -
 arch/arm/configs/lager_defconfig           |    1 -
 arch/arm/configs/mackerel_defconfig        |    1 -
 arch/arm/configs/marzen_defconfig          |    1 -
 10 files changed, 10 deletions(-)

diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index cb26c62dc722..c13f560f07db 100644
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -47,7 +47,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_IPV6_SIT is not set
 CONFIG_NETFILTER=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 9287a62de830..1edc2ce32063 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -57,7 +57,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_MD=y
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index 80cff50beb34..564eab338f02 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -43,7 +43,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
index aa0b704f48af..5fa44cb6e915 100644
--- a/arch/arm/configs/genmai_defconfig
+++ b/arch/arm/configs/genmai_defconfig
@@ -49,7 +49,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CORE is not set
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
index e248f49d5549..c8ebeb1f0497 100644
--- a/arch/arm/configs/koelsch_defconfig
+++ b/arch/arm/configs/koelsch_defconfig
@@ -35,7 +35,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_CADENCE is not set
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
index e42ce3756af3..3ee3858939d9 100644
--- a/arch/arm/configs/kzm9d_defconfig
+++ b/arch/arm/configs/kzm9d_defconfig
@@ -49,7 +49,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 9934dbc23d64..800faff9df1d 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -59,7 +59,6 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IRDA=y
 CONFIG_SH_IRDA=y
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index 883443f8f4f3..da8fa5e8719b 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -48,7 +48,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_NETDEVICES=y
 # CONFIG_NET_CORE is not set
 # CONFIG_NET_VENDOR_ARC is not set
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
index a61e1653fc5e..9d406022d72b 100644
--- a/arch/arm/configs/mackerel_defconfig
+++ b/arch/arm/configs/mackerel_defconfig
@@ -41,7 +41,6 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CONCAT=y
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index f21bd405cc2a..fe3d8f7c0a2c 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -42,7 +42,6 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_FW_LOADER is not set
-- 
1.7.9.5

[PATCH 2/4] ARM: shmobile: Set CONFIG_LOCALVERSION in defconfigs

[Geert Uytterhoeven]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

This allows to derive the kernel flavor from the kernel version.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
---
 arch/arm/configs/ape6evm_defconfig         |    1 +
 arch/arm/configs/armadillo800eva_defconfig |    1 +
 arch/arm/configs/bockw_defconfig           |    1 +
 arch/arm/configs/genmai_defconfig          |    1 +
 arch/arm/configs/koelsch_defconfig         |    1 +
 arch/arm/configs/kzm9d_defconfig           |    1 +
 arch/arm/configs/kzm9g_defconfig           |    1 +
 arch/arm/configs/lager_defconfig           |    1 +
 arch/arm/configs/mackerel_defconfig        |    1 +
 arch/arm/configs/marzen_defconfig          |    1 +
 10 files changed, 10 insertions(+)

diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index c13f560f07db..554611c82d04 100644
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-ape6evm"
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_NO_HZ=y
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
index 1edc2ce32063..2e8212d4c51e 100644
--- a/arch/arm/configs/armadillo800eva_defconfig
+++ b/arch/arm/configs/armadillo800eva_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-armadillo800eva"
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index 564eab338f02..0f583fecfc69 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-bockw"
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_KERNEL_LZMA=y
 CONFIG_NO_HZ=y
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
index 5fa44cb6e915..ede35f400df2 100644
--- a/arch/arm/configs/genmai_defconfig
+++ b/arch/arm/configs/genmai_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-genmai"
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
index c8ebeb1f0497..f795ea42a8fc 100644
--- a/arch/arm/configs/koelsch_defconfig
+++ b/arch/arm/configs/koelsch_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-koelsch"
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
index 3ee3858939d9..2d1b9b3740dd 100644
--- a/arch/arm/configs/kzm9d_defconfig
+++ b/arch/arm/configs/kzm9d_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-kzm9d"
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 800faff9df1d..26a3303bcdf7 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-kzm9g"
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index da8fa5e8719b..18b9dd96250a 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-lager"
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
index 9d406022d72b..f303b8c5b7d2 100644
--- a/arch/arm/configs/mackerel_defconfig
+++ b/arch/arm/configs/mackerel_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-mackerel"
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index fe3d8f7c0a2c..b89105b12ae6 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-marzen"
 # CONFIG_ARM_PATCH_PHYS_VIRT is not set
 CONFIG_EXPERIMENTAL=y
 CONFIG_KERNEL_LZMA=y
-- 
1.7.9.5

[PATCH 3/4] ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

[Geert Uytterhoeven]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
---
 arch/arm/mach-shmobile/include/mach/common.h |    1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index e31980590eb4..cb8e32deb2a3 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -25,7 +25,6 @@ extern int shmobile_smp_apmu_boot_secondary(unsigned int cpu,
 					    struct task_struct *idle);
 extern void shmobile_smp_apmu_cpu_die(unsigned int cpu);
 extern int shmobile_smp_apmu_cpu_kill(unsigned int cpu);
-extern void shmobile_invalidate_start(void);
 struct clk;
 extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
-- 
1.7.9.5

[PATCH 4/4] ARM: shmobile: lager: Make spi_flash_data const

[Geert Uytterhoeven]

From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
---
 arch/arm/mach-shmobile/board-lager.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index f20c10a18543..40ace7195f84 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -263,7 +263,7 @@ static struct mtd_partition spi_flash_part[] = {
 	},
 };
 
-static struct flash_platform_data spi_flash_data = {
+static const struct flash_platform_data spi_flash_data = {
 	.name           = "m25p80",
 	.parts          = spi_flash_part,
 	.nr_parts       = ARRAY_SIZE(spi_flash_part),
-- 
1.7.9.5

[PATCH 2/4] ARM: shmobile: Set CONFIG_LOCALVERSION in defconfigs

[Simon Horman]

On Fri, Jan 03, 2014 at 04:48:46PM +0100, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> 
> This allows to derive the kernel flavor from the kernel version.

Is this a common practice for ARM?

I'm a little hesitant to take this if its not.
Particularly as we are planing to deprecate these defconfigs
in favour of a shared multiplatform defconfig.

> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> ---
>  arch/arm/configs/ape6evm_defconfig         |    1 +
>  arch/arm/configs/armadillo800eva_defconfig |    1 +
>  arch/arm/configs/bockw_defconfig           |    1 +
>  arch/arm/configs/genmai_defconfig          |    1 +
>  arch/arm/configs/koelsch_defconfig         |    1 +
>  arch/arm/configs/kzm9d_defconfig           |    1 +
>  arch/arm/configs/kzm9g_defconfig           |    1 +
>  arch/arm/configs/lager_defconfig           |    1 +
>  arch/arm/configs/mackerel_defconfig        |    1 +
>  arch/arm/configs/marzen_defconfig          |    1 +
>  10 files changed, 10 insertions(+)
> 
> diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
> index c13f560f07db..554611c82d04 100644
> --- a/arch/arm/configs/ape6evm_defconfig
> +++ b/arch/arm/configs/ape6evm_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-ape6evm"
>  CONFIG_SYSVIPC=y
>  CONFIG_POSIX_MQUEUE=y
>  CONFIG_NO_HZ=y
> diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
> index 1edc2ce32063..2e8212d4c51e 100644
> --- a/arch/arm/configs/armadillo800eva_defconfig
> +++ b/arch/arm/configs/armadillo800eva_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-armadillo800eva"
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
>  CONFIG_IKCONFIG=y
> diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
> index 564eab338f02..0f583fecfc69 100644
> --- a/arch/arm/configs/bockw_defconfig
> +++ b/arch/arm/configs/bockw_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-bockw"
>  # CONFIG_ARM_PATCH_PHYS_VIRT is not set
>  CONFIG_KERNEL_LZMA=y
>  CONFIG_NO_HZ=y
> diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
> index 5fa44cb6e915..ede35f400df2 100644
> --- a/arch/arm/configs/genmai_defconfig
> +++ b/arch/arm/configs/genmai_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-genmai"
>  CONFIG_SYSVIPC=y
>  CONFIG_NO_HZ=y
>  CONFIG_IKCONFIG=y
> diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
> index c8ebeb1f0497..f795ea42a8fc 100644
> --- a/arch/arm/configs/koelsch_defconfig
> +++ b/arch/arm/configs/koelsch_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-koelsch"
>  CONFIG_SYSVIPC=y
>  CONFIG_NO_HZ=y
>  CONFIG_IKCONFIG=y
> diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
> index 3ee3858939d9..2d1b9b3740dd 100644
> --- a/arch/arm/configs/kzm9d_defconfig
> +++ b/arch/arm/configs/kzm9d_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-kzm9d"
>  # CONFIG_ARM_PATCH_PHYS_VIRT is not set
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
> diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
> index 800faff9df1d..26a3303bcdf7 100644
> --- a/arch/arm/configs/kzm9g_defconfig
> +++ b/arch/arm/configs/kzm9g_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-kzm9g"
>  # CONFIG_ARM_PATCH_PHYS_VIRT is not set
>  CONFIG_EXPERIMENTAL=y
>  # CONFIG_LOCALVERSION_AUTO is not set
> diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
> index da8fa5e8719b..18b9dd96250a 100644
> --- a/arch/arm/configs/lager_defconfig
> +++ b/arch/arm/configs/lager_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-lager"
>  CONFIG_SYSVIPC=y
>  CONFIG_NO_HZ=y
>  CONFIG_IKCONFIG=y
> diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
> index 9d406022d72b..f303b8c5b7d2 100644
> --- a/arch/arm/configs/mackerel_defconfig
> +++ b/arch/arm/configs/mackerel_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-mackerel"
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_SYSVIPC=y
>  CONFIG_IKCONFIG=y
> diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
> index fe3d8f7c0a2c..b89105b12ae6 100644
> --- a/arch/arm/configs/marzen_defconfig
> +++ b/arch/arm/configs/marzen_defconfig
> @@ -1,3 +1,4 @@
> +CONFIG_LOCALVERSION="-marzen"
>  # CONFIG_ARM_PATCH_PHYS_VIRT is not set
>  CONFIG_EXPERIMENTAL=y
>  CONFIG_KERNEL_LZMA=y
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[PATCH 4/4] ARM: shmobile: lager: Make spi_flash_data const

[Simon Horman]

On Fri, Jan 03, 2014 at 04:48:48PM +0100, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> ---
>  arch/arm/mach-shmobile/board-lager.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
> index f20c10a18543..40ace7195f84 100644
> --- a/arch/arm/mach-shmobile/board-lager.c
> +++ b/arch/arm/mach-shmobile/board-lager.c
> @@ -263,7 +263,7 @@ static struct mtd_partition spi_flash_part[] = {
>  	},
>  };
>  
> -static struct flash_platform_data spi_flash_data = {
> +static const struct flash_platform_data spi_flash_data = {
>  	.name           = "m25p80",
>  	.parts          = spi_flash_part,
>  	.nr_parts       = ARRAY_SIZE(spi_flash_part),

Should spi_flash_part also be const?

And should flash_platform_data and spi_flash_part be annotated
as __initconst?

[PATCH 1/4] ARM: shmobile: Disable /sbin/hotplug fork-bomb in defconfigs

[Simon Horman]

On Fri, Jan 03, 2014 at 04:48:45PM +0100, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> 
> Cfr. commit 7934779a69f1184f29d786b89e77dd14519bd226 ("Driver-Core: disable
> /sbin/hotplug by default").

Could you please flesh out this changelog a bit, perhaps
by including the body of the changelog of
7934779a69f1184f29d786b89e77dd14519bd226.

> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> ---
>  arch/arm/configs/ape6evm_defconfig         |    1 -
>  arch/arm/configs/armadillo800eva_defconfig |    1 -
>  arch/arm/configs/bockw_defconfig           |    1 -
>  arch/arm/configs/genmai_defconfig          |    1 -
>  arch/arm/configs/koelsch_defconfig         |    1 -
>  arch/arm/configs/kzm9d_defconfig           |    1 -
>  arch/arm/configs/kzm9g_defconfig           |    1 -
>  arch/arm/configs/lager_defconfig           |    1 -
>  arch/arm/configs/mackerel_defconfig        |    1 -
>  arch/arm/configs/marzen_defconfig          |    1 -
>  10 files changed, 10 deletions(-)
> 
> diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
> index cb26c62dc722..c13f560f07db 100644
> --- a/arch/arm/configs/ape6evm_defconfig
> +++ b/arch/arm/configs/ape6evm_defconfig
> @@ -47,7 +47,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_LRO is not set
>  # CONFIG_IPV6_SIT is not set
>  CONFIG_NETFILTER=y
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  # CONFIG_FW_LOADER_USER_HELPER is not set
>  CONFIG_NETDEVICES=y
>  # CONFIG_NET_CADENCE is not set
> diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig
> index 9287a62de830..1edc2ce32063 100644
> --- a/arch/arm/configs/armadillo800eva_defconfig
> +++ b/arch/arm/configs/armadillo800eva_defconfig
> @@ -57,7 +57,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_DIAG is not set
>  # CONFIG_IPV6 is not set
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  CONFIG_SCSI=y
>  CONFIG_BLK_DEV_SD=y
>  CONFIG_MD=y
> diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
> index 80cff50beb34..564eab338f02 100644
> --- a/arch/arm/configs/bockw_defconfig
> +++ b/arch/arm/configs/bockw_defconfig
> @@ -43,7 +43,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_LRO is not set
>  # CONFIG_INET_DIAG is not set
>  # CONFIG_IPV6 is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  # CONFIG_STANDALONE is not set
>  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
>  # CONFIG_FW_LOADER is not set
> diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
> index aa0b704f48af..5fa44cb6e915 100644
> --- a/arch/arm/configs/genmai_defconfig
> +++ b/arch/arm/configs/genmai_defconfig
> @@ -49,7 +49,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_DIAG is not set
>  # CONFIG_IPV6 is not set
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  CONFIG_NETDEVICES=y
>  # CONFIG_NET_CORE is not set
>  # CONFIG_NET_VENDOR_ARC is not set
> diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
> index e248f49d5549..c8ebeb1f0497 100644
> --- a/arch/arm/configs/koelsch_defconfig
> +++ b/arch/arm/configs/koelsch_defconfig
> @@ -35,7 +35,6 @@ CONFIG_UNIX=y
>  CONFIG_INET=y
>  CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_DHCP=y
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  CONFIG_NETDEVICES=y
>  # CONFIG_NET_VENDOR_ARC is not set
>  # CONFIG_NET_CADENCE is not set
> diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
> index e42ce3756af3..3ee3858939d9 100644
> --- a/arch/arm/configs/kzm9d_defconfig
> +++ b/arch/arm/configs/kzm9d_defconfig
> @@ -49,7 +49,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_DIAG is not set
>  # CONFIG_IPV6 is not set
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  # CONFIG_BLK_DEV is not set
>  CONFIG_NETDEVICES=y
>  # CONFIG_NET_VENDOR_BROADCOM is not set
> diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
> index 9934dbc23d64..800faff9df1d 100644
> --- a/arch/arm/configs/kzm9g_defconfig
> +++ b/arch/arm/configs/kzm9g_defconfig
> @@ -59,7 +59,6 @@ CONFIG_IP_PNP_DHCP=y
>  CONFIG_IRDA=y
>  CONFIG_SH_IRDA=y
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  CONFIG_SCSI=y
>  CONFIG_BLK_DEV_SD=y
>  CONFIG_NETDEVICES=y
> diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
> index 883443f8f4f3..da8fa5e8719b 100644
> --- a/arch/arm/configs/lager_defconfig
> +++ b/arch/arm/configs/lager_defconfig
> @@ -48,7 +48,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_DIAG is not set
>  # CONFIG_IPV6 is not set
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  CONFIG_NETDEVICES=y
>  # CONFIG_NET_CORE is not set
>  # CONFIG_NET_VENDOR_ARC is not set
> diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig
> index a61e1653fc5e..9d406022d72b 100644
> --- a/arch/arm/configs/mackerel_defconfig
> +++ b/arch/arm/configs/mackerel_defconfig
> @@ -41,7 +41,6 @@ CONFIG_IP_PNP_DHCP=y
>  # CONFIG_INET_XFRM_MODE_BEET is not set
>  # CONFIG_IPV6 is not set
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  # CONFIG_FIRMWARE_IN_KERNEL is not set
>  CONFIG_MTD=y
>  CONFIG_MTD_CONCAT=y
> diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
> index f21bd405cc2a..fe3d8f7c0a2c 100644
> --- a/arch/arm/configs/marzen_defconfig
> +++ b/arch/arm/configs/marzen_defconfig
> @@ -42,7 +42,6 @@ CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_DHCP=y
>  # CONFIG_IPV6 is not set
>  # CONFIG_WIRELESS is not set
> -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
>  # CONFIG_STANDALONE is not set
>  # CONFIG_PREVENT_FIRMWARE_BUILD is not set
>  # CONFIG_FW_LOADER is not set
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

[PATCH 3/4] ARM: shmobile: Remove duplicate shmobile_invalidate_start() declaration

[Simon Horman]

On Fri, Jan 03, 2014 at 04:48:47PM +0100, Geert Uytterhoeven wrote:
> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> ---
>  arch/arm/mach-shmobile/include/mach/common.h |    1 -
>  1 file changed, 1 deletion(-)

Thanks, I will queue this up.

[PATCH 4/4] ARM: shmobile: lager: Make spi_flash_data const

[Geert Uytterhoeven]

On Mon, Jan 6, 2014 at 3:31 AM, Simon Horman <horms@verge.net.au> wrote:
>> -static struct flash_platform_data spi_flash_data = {
>> +static const struct flash_platform_data spi_flash_data = {
>>       .name           = "m25p80",
>>       .parts          = spi_flash_part,
>>       .nr_parts       = ARRAY_SIZE(spi_flash_part),
>
> Should spi_flash_part also be const?

No, .parts is a non-const pointer (but perhaps it can be made const, but that
may be more invasive, and have side-effects).

> And should flash_platform_data and spi_flash_part be annotated
> as __initconst?

AFAIU, those are not copied.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH 2/4] ARM: shmobile: Set CONFIG_LOCALVERSION in defconfigs

[Geert Uytterhoeven]

On Mon, Jan 6, 2014 at 3:27 AM, Simon Horman <horms@verge.net.au> wrote:
> On Fri, Jan 03, 2014 at 04:48:46PM +0100, Geert Uytterhoeven wrote:
>> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
>>
>> This allows to derive the kernel flavor from the kernel version.
>
> Is this a common practice for ARM?

Not really, only 5 ARM deconfigs do that.
Globally, ca. 10% of the Linux defconfigs do it.

> I'm a little hesitant to take this if its not.
> Particularly as we are planing to deprecate these defconfigs
> in favour of a shared multiplatform defconfig.

A shared multiplatform defconfig can still have
CONFIG_LOCALVERSION="-shmobile", so you'll know it's a multiplatform
kernel when you see the dmesg.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH 2/4] ARM: shmobile: Set CONFIG_LOCALVERSION in defconfigs

[Simon Horman]

On Mon, Jan 06, 2014 at 09:43:11AM +0100, Geert Uytterhoeven wrote:
> On Mon, Jan 6, 2014 at 3:27 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Fri, Jan 03, 2014 at 04:48:46PM +0100, Geert Uytterhoeven wrote:
> >> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> >>
> >> This allows to derive the kernel flavor from the kernel version.
> >
> > Is this a common practice for ARM?
> 
> Not really, only 5 ARM deconfigs do that.
> Globally, ca. 10% of the Linux defconfigs do it.
> 
> > I'm a little hesitant to take this if its not.
> > Particularly as we are planing to deprecate these defconfigs
> > in favour of a shared multiplatform defconfig.
> 
> A shared multiplatform defconfig can still have
> CONFIG_LOCALVERSION="-shmobile", so you'll know it's a multiplatform
> kernel when you see the dmesg.

Not if it is shared more widely :^)

[PATCH 2/4] ARM: shmobile: Set CONFIG_LOCALVERSION in defconfigs

[Simon Horman]

On Mon, Jan 06, 2014 at 05:47:40PM +0900, Simon Horman wrote:
> On Mon, Jan 06, 2014 at 09:43:11AM +0100, Geert Uytterhoeven wrote:
> > On Mon, Jan 6, 2014 at 3:27 AM, Simon Horman <horms@verge.net.au> wrote:
> > > On Fri, Jan 03, 2014 at 04:48:46PM +0100, Geert Uytterhoeven wrote:
> > >> From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
> > >>
> > >> This allows to derive the kernel flavor from the kernel version.
> > >
> > > Is this a common practice for ARM?
> > 
> > Not really, only 5 ARM deconfigs do that.
> > Globally, ca. 10% of the Linux defconfigs do it.
> > 
> > > I'm a little hesitant to take this if its not.
> > > Particularly as we are planing to deprecate these defconfigs
> > > in favour of a shared multiplatform defconfig.
> > 
> > A shared multiplatform defconfig can still have
> > CONFIG_LOCALVERSION="-shmobile", so you'll know it's a multiplatform
> > kernel when you see the dmesg.
> 
> Not if it is shared more widely :^)

I'm not really sold on this patch as I don't truly understand
its motivation and I am reluctant to move towards an
uncommon practice for ARM. I am not planning to take this
patch at this time.

[PATCH 4/4] ARM: shmobile: lager: Make spi_flash_data const

[Simon Horman]

On Mon, Jan 06, 2014 at 09:09:53AM +0100, Geert Uytterhoeven wrote:
> On Mon, Jan 6, 2014 at 3:31 AM, Simon Horman <horms@verge.net.au> wrote:
> >> -static struct flash_platform_data spi_flash_data = {
> >> +static const struct flash_platform_data spi_flash_data = {
> >>       .name           = "m25p80",
> >>       .parts          = spi_flash_part,
> >>       .nr_parts       = ARRAY_SIZE(spi_flash_part),
> >
> > Should spi_flash_part also be const?
> 
> No, .parts is a non-const pointer (but perhaps it can be made const, but that
> may be more invasive, and have side-effects).
> 
> > And should flash_platform_data and spi_flash_part be annotated
> > as __initconst?
> 
> AFAIU, those are not copied.

Thanks, I will queue up this patch as is.