diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
commit | 1f3f424a6bee9de4d839be9951f4296333fac014 (patch) | |
tree | 95de90dfdb4a9f64fe470709b82176243537c952 /Documentation | |
parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) | |
parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/arm/mem_alignment | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/mem_alignment b/Documentation/arm/mem_alignment index d145ccca169a..c7c7a114c78c 100644 --- a/Documentation/arm/mem_alignment +++ b/Documentation/arm/mem_alignment | |||
@@ -24,7 +24,7 @@ real bad - it changes the behaviour of all unaligned instructions in user | |||
24 | space, and might cause programs to fail unexpectedly. | 24 | space, and might cause programs to fail unexpectedly. |
25 | 25 | ||
26 | To change the alignment trap behavior, simply echo a number into | 26 | To change the alignment trap behavior, simply echo a number into |
27 | /proc/sys/debug/alignment. The number is made up from various bits: | 27 | /proc/cpu/alignment. The number is made up from various bits: |
28 | 28 | ||
29 | bit behavior when set | 29 | bit behavior when set |
30 | --- ----------------- | 30 | --- ----------------- |