[Blackfin][PATCH] remove asm/page.h as we do not actually use/want any of these defin...

diff --git a/cpu/bf533/traps.c b/cpu/bf533/traps.c
index 248e34f3f5b0636b6380075f9e3ec9353d841d41..113bf3c37d89a168d3b583af02b4495f092f5292 100644 (file)
--- a/cpu/bf533/traps.c
+++ b/cpu/bf533/traps.c
@@ -39,7 +39,6 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/traps.h>
-#include <asm/page.h>
 #include <asm/machdep.h>
 #include "cpu.h"
 #include <asm/arch/anomaly.h>

diff --git a/cpu/bf537/traps.c b/cpu/bf537/traps.c
index 994ece8f64c8aff4c3c1ef6997c5b980fbe48bbd..702e0ccb988bc84ed7532bf68ff97e5ed6edb192 100644 (file)
--- a/cpu/bf537/traps.c
+++ b/cpu/bf537/traps.c
@@ -39,7 +39,6 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/traps.h>
-#include <asm/page.h>
 #include <asm/machdep.h>
 #include "cpu.h"
 #include <asm/arch/anomaly.h>

diff --git a/include/asm-blackfin/entry.h b/include/asm-blackfin/entry.h
index b64d406992864d04ab38d01c07727a4379149acf..a5db071ff60cc8d94ad5f42df9af3953767d33ae 100644 (file)
--- a/include/asm-blackfin/entry.h
+++ b/include/asm-blackfin/entry.h
@@ -27,7 +27,6 @@
 
 #include <linux/config.h>
 #include <asm/setup.h>
-#include <asm/page.h>
 
 /*
  * Stack layout in 'ret_from_exception':

diff --git a/include/asm-blackfin/page.h b/include/asm-blackfin/page.h
deleted file mode 100644 (file)
index d59828c..0000000
--- a/include/asm-blackfin/page.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * U-boot -  page.h
- *
- * Copyright (c) 2005 blackfin.uclinux.org
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _BLACKFIN_PAGE_H
-#define _BLACKFIN_PAGE_H
-
-#include <linux/config.h>
-
-/* PAGE_SHIFT determines the page size */
-
-#define PAGE_SHIFT                     (12)
-#define PAGE_SIZE                      (4096)
-#define PAGE_MASK                      (~(PAGE_SIZE-1))
-
-#ifdef __KERNEL__
-
-#include <asm/setup.h>
-
-#if PAGE_SHIFT < 13
-#define                                        KTHREAD_SIZE (8192)
-#else
-#define                                        KTHREAD_SIZE PAGE_SIZE
-#endif
-
-#ifndef __ASSEMBLY__
-
-#define get_user_page(vaddr)           __get_free_page(GFP_KERNEL)
-#define free_user_page(page, addr)     free_page(addr)
-
-#define clear_page(page)               memset((page), 0, PAGE_SIZE)
-#define copy_page(to,from)             memcpy((to), (from), PAGE_SIZE)
-
-#define clear_user_page(page, vaddr)   clear_page(page)
-#define copy_user_page(to, from, vaddr)        copy_page(to, from)
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct {
-       unsigned long pte;
-} pte_t;
-typedef struct {
-       unsigned long pmd[16];
-} pmd_t;
-typedef struct {
-       unsigned long pgd;
-} pgd_t;
-typedef struct {
-       unsigned long pgprot;
-} pgprot_t;
-
-#define pte_val(x)                     ((x).pte)
-#define pmd_val(x)                     ((&x)->pmd[0])
-#define pgd_val(x)                     ((x).pgd)
-#define pgprot_val(x)                  ((x).pgprot)
-
-#define __pte(x)                       ((pte_t) { (x) } )
-#define __pmd(x)                       ((pmd_t) { (x) } )
-#define __pgd(x)                       ((pgd_t) { (x) } )
-#define __pgprot(x)                    ((pgprot_t) { (x) } )
-
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)               (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-
-/* Pure 2^n version of get_order */
-extern __inline__ int get_order(unsigned long size)
-{
-       int order;
-
-       size = (size - 1) >> (PAGE_SHIFT - 1);
-       order = -1;
-       do {
-               size >>= 1;
-               order++;
-       } while (size);
-       return order;
-}
-
-#endif /* !__ASSEMBLY__ */
-
-#include <asm/page_offset.h>
-
-#define PAGE_OFFSET                    (PAGE_OFFSET_RAW)
-
-#ifndef __ASSEMBLY__
-
-#define __pa(vaddr)                    virt_to_phys((void *)vaddr)
-#define __va(paddr)                    phys_to_virt((unsigned long)paddr)
-
-#define MAP_NR(addr)                   (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)
-#define virt_to_page(addr)             (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT))
-#define VALID_PAGE(page)               ((page - mem_map) < max_mapnr)
-
-#define PAGE_BUG(page) do      { \
-       BUG(); \
-} while (0)
-
-#endif
-
-#endif
-
-#endif

diff --git a/include/asm-blackfin/string.h b/include/asm-blackfin/string.h
index aac6bc99f54f180343e604703ac9484deda13ebb..83d931e192186b07ef9bfc58c2e834f726610ece 100644 (file)
--- a/include/asm-blackfin/string.h
+++ b/include/asm-blackfin/string.h
@@ -30,7 +30,6 @@
 #ifdef __KERNEL__              /* only set these up for kernel code */
 
 #include <asm/setup.h>
-#include <asm/page.h>
 #include <config.h>
 #include <asm/blackfin.h>
 

diff --git a/include/asm-blackfin/virtconvert.h b/include/asm-blackfin/virtconvert.h
index 769f5a089c097d579b5221f24f44755b48fb15bb..08b4cc01a8b6f574c5c6debcde41ebbeae829241 100644 (file)
--- a/include/asm-blackfin/virtconvert.h
+++ b/include/asm-blackfin/virtconvert.h
@@ -33,7 +33,6 @@
 
 #include <linux/config.h>
 #include <asm/setup.h>
-#include <asm/page.h>
 
 #define mm_vtop(vaddr)         ((unsigned long) vaddr)
 #define mm_ptov(vaddr)         ((unsigned long) vaddr)

diff --git a/lib_blackfin/bf533_string.c b/lib_blackfin/bf533_string.c
index 85b115076afd863f0794c80aa870d72a649da639..88cb343571dc91a193a3b7c6ca6283e60268a195 100644 (file)
--- a/lib_blackfin/bf533_string.c
+++ b/lib_blackfin/bf533_string.c
@@ -27,7 +27,6 @@
 
 #include <common.h>
 #include <asm/setup.h>
-#include <asm/page.h>
 #include <config.h>
 #include <asm/blackfin.h>
 #include <asm/io.h>