On 64 bit architectures with no efficient unaligned access, taskstats has to add some padding to a reply to prevent unaligned access warnings. However this also needs to apply to 32 bit architectures with 64 bit struct alignment such as metag (which has 64 bit memory accesses). This is solved by adding a new Kconfig symbol CONFIG_HAVE_64BIT_ALIGNED_STRUCT which defaults to CONFIG_64BIT, and can be explicitly selected by CONFIG_METAG. Taskstats then uses this symbol instead of CONFIG_64BIT to determine whether to add the padding. Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx> Cc: Balbir Singh <bsingharora@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Eric Paris <eparis@xxxxxxxxxx> Cc: Will Drewry <wad@xxxxxxxxxxxx> Cc: James Morris <james.l.morris@xxxxxxxxxx> --- arch/Kconfig | 16 ++++++++++++++++ kernel/taskstats.c | 3 ++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 72f2fa1..26eba37 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -93,6 +93,22 @@ config UPROBES If in doubt, say "N". +config HAVE_64BIT_ALIGNED_STRUCT + bool + default 64BIT + help + Some architectures have 64bit struct alignment (64 bit + architectures and some 32 bit architectures which can do + 64 bit accesses). + + This symbol should be selected by an architecture if it has + a 64 bit struct alignment requirement even though it isn't + a 64 bit architecture (64 bit architectures have this on by + default). + + See Documentation/unaligned-memory-access.txt for more + information on the topic of unaligned memory accesses. + config HAVE_EFFICIENT_UNALIGNED_ACCESS bool help diff --git a/kernel/taskstats.c b/kernel/taskstats.c index d0a3279..6b26c40 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c @@ -355,7 +355,8 @@ static int parse(struct nlattr *na, struct cpumask *mask) return ret; } -#if defined(CONFIG_64BIT) && !defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) +#if defined(CONFIG_HAVE_64BIT_ALIGNED_STRUCT) && \ + !defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) #define TASKSTATS_NEEDS_PADDING 1 #endif -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
