The patch titled
xtensa: delete accidental file
has been added to the -mm tree. Its filename is
xtensa-delete-accidental-file.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
areca-raid-linux-scsi-driver.patch
drivers-net-ne3210c-cleanups.patch
arch-ppc-kernel-ppc_ksymsc-remove-unused-define-export_symtab_strops.patch
more-vr4181-removal.patch
arch-sh64-kconfig-doesnt-need-its-own-log_buf_shift.patch
i386-fix-incorrect-tss-entry-for-ldt.patch
arch-cris-kconfigdebug-use-lib-kconfigdebug.patch
xtensa-replace-extern-inline-with-static-inline.patch
xtensa-delete-accidental-file.patch
use-select-in-sound-isa-kconfig-fix.patch
fs-jbd-cleanups.patch
remove-register_ioctl32_conversion-and-unregister_ioctl32_conversion.patch
fs-kconfig-quota-help-text-updates.patch
jffs-jffs2-remove-wrong-function-prototypes.patch
arm26-one-g-is-enough-for-everyone.patch
remove-the-second-arg-of-do_timer_interrupt.patch
introduce-and-use-kzalloc-make-kcalloc-a-static-inline.patch
dlm-recovery-make-code-static.patch
dlm-build-fix.patch
kgdb-ga.patch
kgdb-x86_64-support.patch
sysfs-crash-debugging-fix.patch
video_bt848-remove-not-required-part-of-the-help-text.patch
fs-asfs-make-code-static.patch
reiser4-kconfig-help-cleanup.patch
fuse-device-functions.patch
fix-unusual-placement-of-inline-keyword-in-hpet.patch
merge-some-from-rustys-trivial-patches.patch
include-asm-arm26-hardirqh-remove-define-irq_enter.patch
remove-sound-oss-skeletonc.patch
include-asm-i386-extern-inline-static-inline.patch
include-linux-blkdevh-extern-inline-static-inline.patch
extern-inline-static-inline.patch
include-linux-bioh-extern-inline-static-inline.patch
drivers-net-irda-irportc-cleanups.patch
drivers-net-arcnet-possible-cleanups.patch
drivers-net-sk98lin-possible-cleanups.patch
drivers-cdrom-fix-up-schedule_timeout-usage-fix.patch
mm-mmapnommuc-several-unexports.patch
unexport-hugetlb_total_pages.patch
unexport-clear_page_dirty_for_io.patch
mm-filemapc-make-sync_page_range_nolock-static.patch
mm-filemapc-make-generic_file_direct_io-static.patch
mm-page_allocc-unexport-nr_swap_pages.patch
unexport-console_unblank.patch
mm-swapc-unexport-vm_acct_memory.patch
mm-swapfilec-unexport-total_swap_pages.patch
mm-swap_statec-unexport-swapper_space.patch
unexport-idle_cpu.patch
unexport-uts_sem.patch
__deprecated_for_modules-insert_resource.patch
__deprecated_for_modules-panic_timeout.patch
sound-oss-sequencer_syms-unexport-reprogram_timer.patch
From: Adrian Bunk:
This file seems to be an accident.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
Signed-off-by: Chris Zankel <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
dev/null | 135 ---------------------------------------------------------------
1 files changed, 135 deletions(-)
diff -L include/asm-xtensa/page.h.n -puN
include/asm-xtensa/page.h.n~xtensa-delete-accidental-file /dev/null
--- 25/include/asm-xtensa/page.h.n
+++ /dev/null Thu Apr 11 07:25:15 2002
@@ -1,135 +0,0 @@
-/*
- * linux/include/asm-xtensa/page.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version2 as
- * published by the Free Software Foundation.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_PAGE_H
-#define _XTENSA_PAGE_H
-
-#ifdef __KERNEL__
-
-#include <asm/processor.h>
-#include <linux/config.h>
-
-/*
- * PAGE_SHIFT determines the page size
- * PAGE_ALIGN(x) aligns the pointer to the (next) page boundary
- */
-#define PAGE_SHIFT XCHAL_MMU_MIN_PTE_PAGE_SIZE
-#define PAGE_SIZE (1 << PAGE_SHIFT)
-#define PAGE_MASK (~(PAGE_SIZE-1))
-#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE - 1) & PAGE_MASK)
-
-#define DCACHE_WAY_SIZE (XCHAL_DCACHE_SIZE / XCHAL_DCACHE_WAYS)
-#define PAGE_OFFSET XCHAL_KSEG_CACHED_VADDR
-
-#ifdef __ASSEMBLY__
-
-#define __pgprot(x) (x)
-
-#else
-
-
-/*
- * These are used to make use of C type-checking..
- */
-typedef struct { unsigned long pte; } pte_t; /* page table entry */
-typedef struct { unsigned long pmd; } pmd_t; /* PMD table entry */
-typedef struct { unsigned long pgd; } pgd_t; /* PGD table entry */
-typedef struct { unsigned long pgprot; } pgprot_t;
-
-#define pte_val(x) ((x).pte)
-#define pmd_val(x) ((x).pmd)
-#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) } )
-
-/*
- * Pure 2^n version of get_order
- */
-extern __inline__ int get_order(unsigned long size)
-{
- int order;
-#ifndef XCHAL_HAVE_NSU
- unsigned long x1, x2, x4, x8, x16;
-
- size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
- x1 = size & 0xAAAAAAAA;
- x2 = size & 0xCCCCCCCC;
- x4 = size & 0xF0F0F0F0;
- x8 = size & 0xFF00FF00;
- x16 = size & 0xFFFF0000;
- order = x2 ? 2 : 0;
- order += (x16 != 0) * 16;
- order += (x8 != 0) * 8;
- order += (x4 != 0) * 4;
- order += (x1 != 0);
-
- return order;
-#else
- size = (size - 1) >> PAGE_SHIFT;
- asm ("nsau %0, %1" : "=r" (order) : "r" (size));
- return 32 - order;
-#endif
-}
-
-
-struct page;
-extern void clear_page(void *page);
-extern void copy_page(void *to, void *from);
-
-/*
- * If we have cache aliasing and writeback caches, we might have to do
- * some extra work
- */
-
-#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
-void clear_user_page(void *addr, unsigned long vaddr, struct page* page);
-void copy_user_page(void *to, void* from, unsigned long vaddr, struct page*
page);
-#else
-# define clear_user_page(page,vaddr,pg) clear_page(page)
-# define copy_user_page(to, from, vaddr, pg) copy_page(to, from)
-#endif
-
-
-/*
- * This handles the memory map. We handle pages at
- * XCHAL_KSEG_CACHED_VADDR for kernels with 32 bit address space.
- * These macros are for conversion of kernel address, not user
- * addresses.
- */
-
-#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
-#define __va(x) ((void *)((unsigned long) (x) +
PAGE_OFFSET))
-#define pfn_valid(pfn) ((unsigned long)pfn < max_mapnr)
-#ifndef CONFIG_DISCONTIGMEM
-# define pfn_to_page(pfn) (mem_map + (pfn))
-# define page_to_pfn(page) ((unsigned long)((page) - mem_map))
-#else
-# error CONFIG_DISCONTIGMEM not supported
-#endif
-
-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-#define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
-#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
-
-#define WANT_PAGE_VIRTUAL
-
-
-#endif /* __ASSEMBLY__ */
-
-#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-#endif /* __KERNEL__ */
-#endif /* _XTENSA_PAGE_H */
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
