diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-31 11:50:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-31 11:50:32 -0400 |
| commit | edb3e182b6f33c91ba8778e2198220c12712d3ad (patch) | |
| tree | 6b741e144c2c83e901a325e5373dc0b8baf88534 /include/asm-um/pgtable.h | |
| parent | 8973a585aec125beb2a3de50bb491004299f53d5 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'include/asm-um/pgtable.h')
| -rw-r--r-- | include/asm-um/pgtable.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h index 510e513c7f88..a88040920311 100644 --- a/include/asm-um/pgtable.h +++ b/include/asm-um/pgtable.h @@ -114,17 +114,9 @@ extern unsigned long end_iomem; extern unsigned long pg0[1024]; /* - * BAD_PAGETABLE is used when we need a bogus page-table, while - * BAD_PAGE is used for a bogus page. - * * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc.. */ -extern pte_t __bad_page(void); -extern pte_t * __bad_pagetable(void); - -#define BAD_PAGETABLE __bad_pagetable() -#define BAD_PAGE __bad_page() #define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page) |