diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /include/asm-avr32 | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-avr32')
| -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 | /* |