From 4f0f4e4e28209bc5d7f51d6b4fb6d32519ea7ae9 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 12 Jun 2006 12:20:09 +0100 Subject: [PATCH] --- yaml --- r: 27674 b: refs/heads/master c: d9b8d0da404cf952a425d990c37c29c166eec954 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-mips/mmzone.h | 3 --- trunk/include/asm-mips/pgtable.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 67565c787b68..8b79ec656d8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e53639d8f313974a87540015cbb0832905be6056 +refs/heads/master: d9b8d0da404cf952a425d990c37c29c166eec954 diff --git a/trunk/include/asm-mips/mmzone.h b/trunk/include/asm-mips/mmzone.h index 79f4491403b6..f6bd2e0c45a1 100644 --- a/trunk/include/asm-mips/mmzone.h +++ b/trunk/include/asm-mips/mmzone.h @@ -14,9 +14,6 @@ #define kvaddr_to_nid(kvaddr) pa_to_nid(__pa(kvaddr)) #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) -/* XXX: FIXME -- wli */ -#define kern_addr_valid(addr) (0) - #endif /* CONFIG_DISCONTIGMEM */ #endif /* _ASM_MMZONE_H_ */ diff --git a/trunk/include/asm-mips/pgtable.h b/trunk/include/asm-mips/pgtable.h index d0af2a3b0152..be75cca20e8d 100644 --- a/trunk/include/asm-mips/pgtable.h +++ b/trunk/include/asm-mips/pgtable.h @@ -379,9 +379,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, __update_cache(vma, address, pte); } -#ifndef CONFIG_NEED_MULTIPLE_NODES #define kern_addr_valid(addr) (1) -#endif #ifdef CONFIG_64BIT_PHYS_ADDR extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t prot);