rpms/kernel/FC-3 linux-2.6.12-devmem.patch,1.2,1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 7 19:41:59 UTC 2005
- Previous message (by thread): rpms/selinux-policy-targeted/FC-3 policy-20050104.patch, 1.29, 1.30 selinux-policy-targeted.spec, 1.199, 1.200
- Next message (by thread): rpms/kernel/FC-3 linux-2.6.0-devmem.patch, 1.12, NONE linux-2.6.11-devmem-whodunnit.patch, 1.1, NONE linux-2.6.7-devmem.patch, 1.7, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv28235
Modified Files:
linux-2.6.12-devmem.patch
Log Message:
build fix
linux-2.6.12-devmem.patch:
b/include/asm-alpha/io.h | 11 +
b/include/asm-arm/io.h | 11 +
b/include/asm-arm26/io.h | 11 +
b/include/asm-cris/io.h | 11 +
b/include/asm-frv/io.h | 12 +
b/include/asm-h8300/io.h | 11 +
b/include/asm-i386/io.h | 11 +
b/include/asm-ia64/uaccess.h | 36 ++++
b/include/asm-m32r/io.h | 11 +
b/include/asm-m68k/io.h | 14 +
b/include/asm-m68knommu/io.h | 11 +
b/include/asm-mips/io.h | 11 +
b/include/asm-parisc/io.h | 11 +
b/include/asm-ppc/io.h | 11 +
b/include/asm-ppc64/io.h | 11 +
b/include/asm-s390/io.h | 11 +
b/include/asm-sparc/io.h | 13 +
b/include/asm-sparc64/io.h | 11 +
b/include/asm-um/io.h | 11 +
b/include/asm-v850/io.h | 11 +
b/include/asm-x86_64/io.h | 11 +
b/include/linux/page-flags.h | 6
linux-2.6.11/drivers/char/mem.c | 291 +++++++++++++++++++++++++++++-----------
23 files changed, 483 insertions(+), 76 deletions(-)
Index: linux-2.6.12-devmem.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6.12-devmem.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.12-devmem.patch 7 Apr 2005 16:08:08 -0000 1.2
+++ linux-2.6.12-devmem.patch 7 Apr 2005 19:41:56 -0000 1.3
@@ -421,3 +421,488 @@
static struct file_operations kmem_fops = {
.llseek = memory_lseek,
+
+diff -Nru a/include/asm-alpha/io.h b/include/asm-alpha/io.h
+--- a/include/asm-alpha/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-alpha/io.h 2005-04-07 15:38:00 -04:00
+@@ -666,6 +666,17 @@
+ #define writeq writeq
+ #define readq readq
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif /* __ALPHA_IO_H */
+diff -Nru a/include/asm-arm/io.h b/include/asm-arm/io.h
+--- a/include/asm-arm/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-arm/io.h 2005-04-07 15:38:00 -04:00
+@@ -271,5 +271,16 @@
+ #define BIOVEC_MERGEABLE(vec1, vec2) \
+ ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_IO_H */
+diff -Nru a/include/asm-arm26/io.h b/include/asm-arm26/io.h
+--- a/include/asm-arm26/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-arm26/io.h 2005-04-07 15:38:00 -04:00
+@@ -420,5 +420,16 @@
+ #define BIOVEC_MERGEABLE(vec1, vec2) \
+ ((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_IO_H */
+diff -Nru a/include/asm-cris/io.h b/include/asm-cris/io.h
+--- a/include/asm-cris/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-cris/io.h 2005-04-07 15:38:00 -04:00
+@@ -86,4 +86,15 @@
+ #define outsw(x,y,z)
+ #define outsl(x,y,z)
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif
+diff -Nru a/include/asm-frv/io.h b/include/asm-frv/io.h
+--- a/include/asm-frv/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-frv/io.h 2005-04-07 15:38:00 -04:00
+@@ -273,6 +273,18 @@
+ __asm__ __volatile__ ("membar" : : :"memory");
+ }
+
++
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _ASM_IO_H */
+diff -Nru a/include/asm-h8300/io.h b/include/asm-h8300/io.h
+--- a/include/asm-h8300/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-h8300/io.h 2005-04-07 15:38:00 -04:00
+@@ -317,6 +317,17 @@
+ #define virt_to_bus virt_to_phys
+ #define bus_to_virt phys_to_virt
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _H8300_IO_H */
+diff -Nru a/include/asm-i386/io.h b/include/asm-i386/io.h
+--- a/include/asm-i386/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-i386/io.h 2005-04-07 15:38:00 -04:00
+@@ -49,6 +49,17 @@
+
+ #include <linux/vmalloc.h>
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ /**
+ * virt_to_phys - map virtual addresses to physical
+ * @address: address to remap
+diff -Nru a/include/asm-ia64/uaccess.h b/include/asm-ia64/uaccess.h
+--- a/include/asm-ia64/uaccess.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-ia64/uaccess.h 2005-04-07 15:38:00 -04:00
+@@ -35,6 +35,8 @@
+ #include <linux/compiler.h>
+ #include <linux/errno.h>
+ #include <linux/sched.h>
++#include <linux/page-flags.h>
++#include <linux/mm.h>
+
+ #include <asm/intrinsics.h>
+ #include <asm/pgtable.h>
+@@ -365,6 +367,40 @@
+ return 1;
+ }
+ return 0;
++}
++
++#define ARCH_HAS_TRANSLATE_MEM_PTR 1
++static __inline__ char *
++xlate_dev_mem_ptr (unsigned long p)
++{
++ struct page *page;
++ char * ptr;
++
++ page = pfn_to_page(p >> PAGE_SHIFT);
++ if (PageUncached(page))
++ ptr = (char *)p + __IA64_UNCACHED_OFFSET;
++ else
++ ptr = __va(p);
++
++ return ptr;
++}
++
++/*
++ * Convert a virtual cached kernel memory pointer to an uncached pointer
++ */
++static __inline__ char *
++xlate_dev_kmem_ptr (char * p)
++{
++ struct page *page;
++ char * ptr;
++
++ page = virt_to_page((unsigned long)p >> PAGE_SHIFT);
++ if (PageUncached(page))
++ ptr = (char *)__pa(p) + __IA64_UNCACHED_OFFSET;
++ else
++ ptr = p;
++
++ return ptr;
+ }
+
+ #endif /* _ASM_IA64_UACCESS_H */
+diff -Nru a/include/asm-m32r/io.h b/include/asm-m32r/io.h
+--- a/include/asm-m32r/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-m32r/io.h 2005-04-07 15:38:00 -04:00
+@@ -216,6 +216,17 @@
+ memcpy((void __force *) dst, src, count);
+ }
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _ASM_M32R_IO_H */
+diff -Nru a/include/asm-m68k/io.h b/include/asm-m68k/io.h
+--- a/include/asm-m68k/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-m68k/io.h 2005-04-07 15:38:00 -04:00
+@@ -359,4 +359,18 @@
+ #endif
+
+ #endif /* __KERNEL__ */
++
++#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED 1
++
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* _IO_H */
+diff -Nru a/include/asm-m68knommu/io.h b/include/asm-m68knommu/io.h
+--- a/include/asm-m68knommu/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-m68knommu/io.h 2005-04-07 15:38:00 -04:00
+@@ -187,6 +187,17 @@
+ #define virt_to_bus virt_to_phys
+ #define bus_to_virt phys_to_virt
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _M68KNOMMU_IO_H */
+diff -Nru a/include/asm-mips/io.h b/include/asm-mips/io.h
+--- a/include/asm-mips/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-mips/io.h 2005-04-07 15:38:00 -04:00
+@@ -616,4 +616,15 @@
+ #define csr_out32(v,a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST) = (v))
+ #define csr_in32(a) (*(volatile u32 *)((unsigned long)(a) + __CSR_32_ADJUST))
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* _ASM_IO_H */
+diff -Nru a/include/asm-parisc/io.h b/include/asm-parisc/io.h
+--- a/include/asm-parisc/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-parisc/io.h 2005-04-07 15:38:00 -04:00
+@@ -404,4 +404,15 @@
+
+ #include <asm-generic/iomap.h>
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif
+diff -Nru a/include/asm-ppc/io.h b/include/asm-ppc/io.h
+--- a/include/asm-ppc/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-ppc/io.h 2005-04-07 15:38:00 -04:00
+@@ -552,4 +552,15 @@
+ #include <asm/mpc8260_pci9.h>
+ #endif
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+diff -Nru a/include/asm-ppc64/io.h b/include/asm-ppc64/io.h
+--- a/include/asm-ppc64/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-ppc64/io.h 2005-04-07 15:38:00 -04:00
+@@ -442,6 +442,17 @@
+ extern int check_legacy_ioport(unsigned long base_port);
+
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif /* _PPC64_IO_H */
+diff -Nru a/include/asm-s390/io.h b/include/asm-s390/io.h
+--- a/include/asm-s390/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-s390/io.h 2005-04-07 15:38:00 -04:00
+@@ -107,6 +107,17 @@
+
+ #define mmiowb()
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif
+diff -Nru a/include/asm-sparc/io.h b/include/asm-sparc/io.h
+--- a/include/asm-sparc/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-sparc/io.h 2005-04-07 15:38:00 -04:00
+@@ -274,4 +274,17 @@
+
+ #endif
+
++#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED 1
++
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* !(__SPARC_IO_H) */
+diff -Nru a/include/asm-sparc64/io.h b/include/asm-sparc64/io.h
+--- a/include/asm-sparc64/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-sparc64/io.h 2005-04-07 15:38:00 -04:00
+@@ -485,6 +485,17 @@
+ #define dma_cache_wback(_start,_size) do { } while (0)
+ #define dma_cache_wback_inv(_start,_size) do { } while (0)
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif
+
+ #endif /* !(__SPARC64_IO_H) */
+diff -Nru a/include/asm-um/io.h b/include/asm-um/io.h
+--- a/include/asm-um/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-um/io.h 2005-04-07 15:38:00 -04:00
+@@ -22,4 +22,15 @@
+ return __va(address);
+ }
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif
+diff -Nru a/include/asm-v850/io.h b/include/asm-v850/io.h
+--- a/include/asm-v850/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-v850/io.h 2005-04-07 15:38:00 -04:00
+@@ -119,4 +119,15 @@
+ #define memcpy_fromio(dst, src, len) memcpy (dst, (void *)src, len)
+ #define memcpy_toio(dst, src, len) memcpy ((void *)dst, src, len)
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __V850_IO_H__ */
+diff -Nru a/include/asm-x86_64/io.h b/include/asm-x86_64/io.h
+--- a/include/asm-x86_64/io.h 2005-04-07 15:38:00 -04:00
++++ b/include/asm-x86_64/io.h 2005-04-07 15:38:00 -04:00
+@@ -329,6 +329,17 @@
+ extern int iommu_bio_merge;
+ #define BIO_VMERGE_BOUNDARY iommu_bio_merge
+
++/*
++ * Convert a physical pointer to a virtual kernel pointer for /dev/mem
++ * access
++ */
++#define xlate_dev_mem_ptr(p) __va(p)
++
++/*
++ * Convert a virtual cached pointer to an uncached pointer
++ */
++#define xlate_dev_kmem_ptr(p) p
++
+ #endif /* __KERNEL__ */
+
+ #endif
+diff -Nru a/include/linux/page-flags.h b/include/linux/page-flags.h
+--- a/include/linux/page-flags.h 2005-04-07 15:38:00 -04:00
++++ b/include/linux/page-flags.h 2005-04-07 15:38:00 -04:00
+@@ -75,7 +75,7 @@
+ #define PG_mappedtodisk 17 /* Has blocks allocated on-disk */
+ #define PG_reclaim 18 /* To be reclaimed asap */
+ #define PG_nosave_free 19 /* Free, should not be written */
+-
++#define PG_uncached 20 /* Page has been mapped as uncached */
+
+ /*
+ * Global page accounting. One instance per CPU. Only unsigned longs are
+@@ -300,6 +300,10 @@
+ #else
+ #define PageSwapCache(page) 0
+ #endif
++
++#define PageUncached(page) test_bit(PG_uncached, &(page)->flags)
++#define SetPageUncached(page) set_bit(PG_uncached, &(page)->flags)
++#define ClearPageUncached(page) clear_bit(PG_uncached, &(page)->flags)
+
+ struct page; /* forward declaration */
+
- Previous message (by thread): rpms/selinux-policy-targeted/FC-3 policy-20050104.patch, 1.29, 1.30 selinux-policy-targeted.spec, 1.199, 1.200
- Next message (by thread): rpms/kernel/FC-3 linux-2.6.0-devmem.patch, 1.12, NONE linux-2.6.11-devmem-whodunnit.patch, 1.1, NONE linux-2.6.7-devmem.patch, 1.7, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list