diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 11:43:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 11:43:27 -0500 |
| commit | 99642e211a789df34347c3f10f0301462837f0c5 (patch) | |
| tree | 5979e8fd2e480f2d4f20cdab12a7ff92b41bd73e /include | |
| parent | 84b9a774008b132a8b5bd5460f639028a9c7f971 (diff) | |
| parent | 325d6f5593b40b5a48cf4ade74c01681f2ff6044 (diff) | |
Merge branch 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'avr32-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Fix OCD refcounting bug
avr32: Call tick_nohz_{stop,restart}_sched_tick() in idle loop
avr32: Use correct config symbol in atstk1004 board code
avr32: Fix broken pte dump code in do_page_fault()
AVR32: Define PAGE_SHARED
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/pgtable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-avr32/pgtable.h b/include/asm-avr32/pgtable.h index 018f6e2a0242..3ae7b548fce7 100644 --- a/include/asm-avr32/pgtable.h +++ b/include/asm-avr32/pgtable.h | |||
| @@ -157,6 +157,7 @@ extern struct page *empty_zero_page; | |||
| 157 | #define _PAGE_S(x) _PAGE_NORMAL(x) | 157 | #define _PAGE_S(x) _PAGE_NORMAL(x) |
| 158 | 158 | ||
| 159 | #define PAGE_COPY _PAGE_P(PAGE_WRITE | PAGE_READ) | 159 | #define PAGE_COPY _PAGE_P(PAGE_WRITE | PAGE_READ) |
| 160 | #define PAGE_SHARED _PAGE_S(PAGE_WRITE | PAGE_READ) | ||
| 160 | 161 | ||
| 161 | #ifndef __ASSEMBLY__ | 162 | #ifndef __ASSEMBLY__ |
| 162 | /* | 163 | /* |