aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/pgtable.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-20 23:19:15 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-20 23:19:15 -0400
commitcfa76f024f7c9e65169425804e5b32e71f66d0ee (patch)
treeee64e98cbfb1b654842c9256446a9584857f6730 /include/asm-parisc/pgtable.h
parent093faa1dd26fc6766f8f04c429030757a8a0def4 (diff)
parent7210c678202bb3107085bffeb63f66a9b8ba1c85 (diff)
Merge branch 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (29 commits) [PARISC] fix uninitialized variable warning in asm/rtc.h [PARISC] Port checkstack.pl to parisc [PARISC] Make palo target work when $obj != $src [PARISC] Zap unused variable warnings in pci.c [PARISC] Fix tests in palo target [PARISC] Fix palo target [PARISC] Restore palo target [PARISC] Attempt to clean up parisc/Makefile [PARISC] Fix infinite loop in /proc/iomem [PARISC] Quiet sysfs_create_link __must_check warnings in pdc_stable [PARISC] Squelch pci_enable_device __must_check warning in superio [PARISC] Kill off broken irqstack code [PARISC] Remove hardcoded uses of PAGE_SIZE [PARISC] Clean up pointless ASM_PAGE_SIZE_DIV use [PARISC] Kill off the last vestiges of ASM_PAGE_SIZE [PARISC] Kill off ASM_PAGE_SIZE use [PARISC] Beautify parisc vmlinux.lds.S [PARISC] Clean up a resource_size_t warning in sba_iommu [PARISC] Kill incorrect cast warning in unwinder [PARISC] Kill zone_to_nid printk warning ... Fixed trivial conflict in include/asm-parisc/tlbflush.h manually
Diffstat (limited to 'include/asm-parisc/pgtable.h')
-rw-r--r--include/asm-parisc/pgtable.h40
1 files changed, 16 insertions, 24 deletions
diff --git a/include/asm-parisc/pgtable.h b/include/asm-parisc/pgtable.h
index 9ab79c8e5a41..cd0fa4f73320 100644
--- a/include/asm-parisc/pgtable.h
+++ b/include/asm-parisc/pgtable.h
@@ -49,14 +49,6 @@
49#define pgd_ERROR(e) \ 49#define pgd_ERROR(e) \
50 printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, (unsigned long)pgd_val(e)) 50 printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, (unsigned long)pgd_val(e))
51 51
52 /* Note: If you change ISTACK_SIZE, you need to change the corresponding
53 * values in vmlinux.lds and vmlinux64.lds (init_istack section). Also,
54 * the "order" and size need to agree.
55 */
56
57#define ISTACK_SIZE 32768 /* Interrupt Stack Size */
58#define ISTACK_ORDER 3
59
60/* This is the size of the initially mapped kernel memory */ 52/* This is the size of the initially mapped kernel memory */
61#ifdef CONFIG_64BIT 53#ifdef CONFIG_64BIT
62#define KERNEL_INITIAL_ORDER 24 /* 0 to 1<<24 = 16MB */ 54#define KERNEL_INITIAL_ORDER 24 /* 0 to 1<<24 = 16MB */
@@ -325,27 +317,27 @@ static inline void pgd_clear(pgd_t *pgd) {
325 * setup: the pgd is never bad, and a pmd always exists (as it's folded 317 * setup: the pgd is never bad, and a pmd always exists (as it's folded
326 * into the pgd entry) 318 * into the pgd entry)
327 */ 319 */
328extern inline int pgd_none(pgd_t pgd) { return 0; } 320static inline int pgd_none(pgd_t pgd) { return 0; }
329extern inline int pgd_bad(pgd_t pgd) { return 0; } 321static inline int pgd_bad(pgd_t pgd) { return 0; }
330extern inline int pgd_present(pgd_t pgd) { return 1; } 322static inline int pgd_present(pgd_t pgd) { return 1; }
331extern inline void pgd_clear(pgd_t * pgdp) { } 323static inline void pgd_clear(pgd_t * pgdp) { }
332#endif 324#endif
333 325
334/* 326/*
335 * The following only work if pte_present() is true. 327 * The following only work if pte_present() is true.
336 * Undefined behaviour if not.. 328 * Undefined behaviour if not..
337 */ 329 */
338extern inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; } 330static inline int pte_dirty(pte_t pte) { return pte_val(pte) & _PAGE_DIRTY; }
339extern inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; } 331static inline int pte_young(pte_t pte) { return pte_val(pte) & _PAGE_ACCESSED; }
340extern inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; } 332static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; }
341extern inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; } 333static inline int pte_file(pte_t pte) { return pte_val(pte) & _PAGE_FILE; }
342 334
343extern inline pte_t pte_mkclean(pte_t pte) { pte_val(pte) &= ~_PAGE_DIRTY; return pte; } 335static inline pte_t pte_mkclean(pte_t pte) { pte_val(pte) &= ~_PAGE_DIRTY; return pte; }
344extern inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; } 336static inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~_PAGE_ACCESSED; return pte; }
345extern inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) &= ~_PAGE_WRITE; return pte; } 337static inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) &= ~_PAGE_WRITE; return pte; }
346extern inline pte_t pte_mkdirty(pte_t pte) { pte_val(pte) |= _PAGE_DIRTY; return pte; } 338static inline pte_t pte_mkdirty(pte_t pte) { pte_val(pte) |= _PAGE_DIRTY; return pte; }
347extern inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= _PAGE_ACCESSED; return pte; } 339static inline pte_t pte_mkyoung(pte_t pte) { pte_val(pte) |= _PAGE_ACCESSED; return pte; }
348extern inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= _PAGE_WRITE; return pte; } 340static inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) |= _PAGE_WRITE; return pte; }
349 341
350/* 342/*
351 * Conversion functions: convert a page and protection to a page entry, 343 * Conversion functions: convert a page and protection to a page entry,
@@ -369,7 +361,7 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
369 return pte; 361 return pte;
370} 362}
371 363
372extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 364static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
373{ pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; } 365{ pte_val(pte) = (pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot); return pte; }
374 366
375/* Permanent address of a page. On parisc we don't have highmem. */ 367/* Permanent address of a page. On parisc we don't have highmem. */