diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-15 16:31:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-15 16:31:05 -0800 |
| commit | a3dd15444baa9c7522c8457ab564c41219dfb44c (patch) | |
| tree | 0571fdb4d7201376c03f474e2023144de62e8f1c /Documentation | |
| parent | 7004405cb85cdc10074740705963d9ce3e887f47 (diff) | |
| parent | 1ada1441e73a0f51296bfae527acbeae61ff0d52 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5348/1: fix documentation wrt location of the alignment trap interface
[ARM] Ensure linux/hardirqs.h is included where required
[ARM] fix kernel-doc syntax
[ARM] arch/arm/common/sa1111.c: Correct error handling code
[ARM] 5341/2: there is no copy_page on nommu ARM
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 d145ccca169..c7c7a114c78 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 space, and might cause programs to fail unexpectedly. To change the alignment trap behavior, simply echo a number into -/proc/sys/debug/alignment. The number is made up from various bits: +/proc/cpu/alignment. The number is made up from various bits: bit behavior when set --- ----------------- |