diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-27 20:01:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-01 21:08:54 +0200 |
| commit | ffc660c51b66312938e25fd6af24e3defdd0bc1b (patch) | |
| tree | 954fceb1c217e5034dde95f80cf6ceafb02ec5ac | |
| parent | 89bace652cbfb78a2fd830025f8ea048d6eb3657 (diff) | |
| download | blackbird-op-linux-ffc660c51b66312938e25fd6af24e3defdd0bc1b.tar.gz blackbird-op-linux-ffc660c51b66312938e25fd6af24e3defdd0bc1b.zip | |
ARM: allow building alignment.c without PROC_FS
The two functions cpu_is_v6_unaligned and safe_usermode
are only defined when CONFIG_PROC_FS is enabled, but
are used outside of the #ifdef.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Martin <dave.martin@linaro.org>
| -rw-r--r-- | arch/arm/mm/alignment.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index cfbcf8b95599..c335c76e0d88 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c @@ -86,16 +86,6 @@ core_param(alignment, ai_usermode, int, 0600); #define UM_FIXUP (1 << 1) #define UM_SIGNAL (1 << 2) -#ifdef CONFIG_PROC_FS -static const char *usermode_action[] = { - "ignored", - "warn", - "fixup", - "fixup+warn", - "signal", - "signal+warn" -}; - /* Return true if and only if the ARMv6 unaligned access model is in use. */ static bool cpu_is_v6_unaligned(void) { @@ -123,6 +113,16 @@ static int safe_usermode(int new_usermode, bool warn) return new_usermode; } +#ifdef CONFIG_PROC_FS +static const char *usermode_action[] = { + "ignored", + "warn", + "fixup", + "fixup+warn", + "signal", + "signal+warn" +}; + static int alignment_proc_show(struct seq_file *m, void *v) { seq_printf(m, "User:\t\t%lu\n", ai_user); |
