git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
include
/
asm
/
pgtable.h
diff --git
a/arch/alpha/include/asm/pgtable.h
b/arch/alpha/include/asm/pgtable.h
index
71a2432
..
de98a73
100644
(file)
--- a/
arch/alpha/include/asm/pgtable.h
+++ b/
arch/alpha/include/asm/pgtable.h
@@
-318,9
+318,7
@@
extern inline pte_t * pte_offset_kernel(pmd_t * dir, unsigned long address)
}
#define pte_offset_map(dir,addr) pte_offset_kernel((dir),(addr))
}
#define pte_offset_map(dir,addr) pte_offset_kernel((dir),(addr))
-#define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir),(addr))
#define pte_unmap(pte) do { } while (0)
#define pte_unmap(pte) do { } while (0)
-#define pte_unmap_nested(pte) do { } while (0)
extern pgd_t swapper_pg_dir[1024];
extern pgd_t swapper_pg_dir[1024];