diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 17:45:51 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 17:45:51 -0500 |
| commit | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (patch) | |
| tree | bfaf6b5ddedaa03d31400b25b25cfaa3bd0c9107 /arch/arm/mm/alignment.c | |
| parent | 5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff) | |
| parent | 6cc04a4420391c3f034afe8ea6e28d75912a70a3 (diff) | |
Merge branch 'for-3.3/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/soc
Diffstat (limited to 'arch/arm/mm/alignment.c')
| -rw-r--r-- | arch/arm/mm/alignment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c index c335c76e0d88..caf14dc059e5 100644 --- a/arch/arm/mm/alignment.c +++ b/arch/arm/mm/alignment.c | |||
| @@ -968,7 +968,7 @@ static int __init alignment_init(void) | |||
| 968 | ai_usermode = safe_usermode(ai_usermode, false); | 968 | ai_usermode = safe_usermode(ai_usermode, false); |
| 969 | } | 969 | } |
| 970 | 970 | ||
| 971 | hook_fault_code(1, do_alignment, SIGBUS, BUS_ADRALN, | 971 | hook_fault_code(FAULT_CODE_ALIGNMENT, do_alignment, SIGBUS, BUS_ADRALN, |
| 972 | "alignment exception"); | 972 | "alignment exception"); |
| 973 | 973 | ||
| 974 | /* | 974 | /* |