The patch titled
Consolidate check_signature
has been removed from the -mm tree. Its filename is
consolidate-check_signature.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Consolidate check_signature
From: Matthew Wilcox <matthew@xxxxxx>
There's nothing arch-specific about check_signature(), so move it to
<linux/io.h>. Use a cross between the Alpha and i386 implementations as
the generic one.
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-alpha/io.h | 13 -------------
include/asm-arm/io.h | 17 -----------------
include/asm-frv/io.h | 21 ---------------------
include/asm-i386/io.h | 27 ---------------------------
include/asm-m32r/io.h | 32 --------------------------------
include/asm-mips/io.h | 26 --------------------------
include/asm-powerpc/io.h | 26 --------------------------
include/asm-ppc/io.h | 16 ----------------
include/asm-sh/io.h | 16 ----------------
include/asm-sh64/io.h | 16 ----------------
include/asm-sparc64/io.h | 15 ---------------
include/asm-x86_64/io.h | 27 ---------------------------
include/linux/io.h | 27 +++++++++++++++++++++++++++
13 files changed, 27 insertions(+), 252 deletions(-)
diff -puN include/asm-alpha/io.h~consolidate-check_signature include/asm-alpha/io.h
--- a/include/asm-alpha/io.h~consolidate-check_signature
+++ a/include/asm-alpha/io.h
@@ -533,19 +533,6 @@ extern void outsl (unsigned long port, c
#define eth_io_copy_and_sum(skb,src,len,unused) \
memcpy_fromio((skb)->data,src,len)
-static inline int
-check_signature(const volatile void __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- do {
- if (readb(io_addr) != *signature)
- return 0;
- io_addr++;
- signature++;
- } while (--length);
- return 1;
-}
-
/*
* The Alpha Jensen hardware for some rather strange reason puts
* the RTC clock at 0x170 instead of 0x70. Probably due to some
diff -puN include/asm-arm/io.h~consolidate-check_signature include/asm-arm/io.h
--- a/include/asm-arm/io.h~consolidate-check_signature
+++ a/include/asm-arm/io.h
@@ -193,23 +193,6 @@ extern void _memset_io(volatile void __i
#define eth_io_copy_and_sum(s,c,l,b) \
eth_copy_and_sum((s),__mem_pci(c),(l),(b))
-static inline int
-check_signature(void __iomem *io_addr, const unsigned char *signature,
- int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
#elif !defined(readb)
#define readb(c) (__readwrite_bug("readb"),0)
diff -puN include/asm-frv/io.h~consolidate-check_signature include/asm-frv/io.h
--- a/include/asm-frv/io.h~consolidate-check_signature
+++ a/include/asm-frv/io.h
@@ -385,27 +385,6 @@ static inline void pci_iounmap(struct pc
*/
#define xlate_dev_kmem_ptr(p) p
-/*
- * Check BIOS signature
- */
-static inline int check_signature(volatile void __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
-
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
-
- retval = 1;
-out:
- return retval;
-}
-
#endif /* __KERNEL__ */
#endif /* _ASM_IO_H */
diff -puN include/asm-i386/io.h~consolidate-check_signature include/asm-i386/io.h
--- a/include/asm-i386/io.h~consolidate-check_signature
+++ a/include/asm-i386/io.h
@@ -224,33 +224,6 @@ static inline void memcpy_toio(volatile
#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d))
-/**
- * check_signature - find BIOS signatures
- * @io_addr: mmio address to check
- * @signature: signature block
- * @length: length of signature
- *
- * Perform a signature comparison with the mmio address io_addr. This
- * address should have been obtained by ioremap.
- * Returns 1 on a match.
- */
-
-static inline int check_signature(volatile void __iomem * io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/*
* Cache management
*
diff -puN include/asm-m32r/io.h~consolidate-check_signature include/asm-m32r/io.h
--- a/include/asm-m32r/io.h~consolidate-check_signature
+++ a/include/asm-m32r/io.h
@@ -166,38 +166,6 @@ static inline void _writel(unsigned long
#define flush_write_buffers() do { } while (0) /* M32R_FIXME */
-/**
- * check_signature - find BIOS signatures
- * @io_addr: mmio address to check
- * @signature: signature block
- * @length: length of signature
- *
- * Perform a signature comparison with the ISA mmio address io_addr.
- * Returns 1 on a match.
- *
- * This function is deprecated. New drivers should use ioremap and
- * check_signature.
- */
-
-static inline int check_signature(void __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
-#if 0
-printk("check_signature\n");
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
-#endif
- return retval;
-}
-
static inline void
memset_io(volatile void __iomem *addr, unsigned char val, int count)
{
diff -puN include/asm-mips/io.h~consolidate-check_signature include/asm-mips/io.h
--- a/include/asm-mips/io.h~consolidate-check_signature
+++ a/include/asm-mips/io.h
@@ -562,32 +562,6 @@ extern void pci_iounmap(struct pci_dev *
#define eth_io_copy_and_sum(skb,src,len,unused) memcpy_fromio((skb)->data,(src),(len))
/*
- * check_signature - find BIOS signatures
- * @io_addr: mmio address to check
- * @signature: signature block
- * @length: length of signature
- *
- * Perform a signature comparison with the mmio address io_addr. This
- * address should have been obtained by ioremap.
- * Returns 1 on a match.
- */
-static inline int check_signature(char __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
-/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that
* can be applied to dma buffers.
diff -puN include/asm-powerpc/io.h~consolidate-check_signature include/asm-powerpc/io.h
--- a/include/asm-powerpc/io.h~consolidate-check_signature
+++ a/include/asm-powerpc/io.h
@@ -404,32 +404,6 @@ static inline void __out_be64(volatile u
#include <asm/eeh.h>
-/**
- * check_signature - find BIOS signatures
- * @io_addr: mmio address to check
- * @signature: signature block
- * @length: length of signature
- *
- * Perform a signature comparison with the mmio address io_addr. This
- * address should have been obtained by ioremap.
- * Returns 1 on a match.
- */
-static inline int check_signature(const volatile void __iomem * io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/* Nothing to do */
#define dma_cache_inv(_start,_size) do { } while (0)
diff -puN include/asm-ppc/io.h~consolidate-check_signature include/asm-ppc/io.h
--- a/include/asm-ppc/io.h~consolidate-check_signature
+++ a/include/asm-ppc/io.h
@@ -439,22 +439,6 @@ extern inline void * phys_to_virt(unsign
#define iobarrier_r() eieio()
#define iobarrier_w() eieio()
-static inline int check_signature(volatile void __iomem * io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/*
* Here comes the ppc implementation of the IOMAP
* interfaces.
diff -puN include/asm-sh/io.h~consolidate-check_signature include/asm-sh/io.h
--- a/include/asm-sh/io.h~consolidate-check_signature
+++ a/include/asm-sh/io.h
@@ -304,22 +304,6 @@ __ioremap_mode(unsigned long offset, uns
#define iounmap(addr) \
__iounmap((addr))
-static inline int check_signature(char __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that
diff -puN include/asm-sh64/io.h~consolidate-check_signature include/asm-sh64/io.h
--- a/include/asm-sh64/io.h~consolidate-check_signature
+++ a/include/asm-sh64/io.h
@@ -178,22 +178,6 @@ extern void iounmap(void *addr);
unsigned long onchip_remap(unsigned long addr, unsigned long size, const char* name);
extern void onchip_unmap(unsigned long vaddr);
-static __inline__ int check_signature(volatile void __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/*
* The caches on some architectures aren't dma-coherent and have need to
* handle this in software. There are three types of operations that
diff -puN include/asm-sparc64/io.h~consolidate-check_signature include/asm-sparc64/io.h
--- a/include/asm-sparc64/io.h~consolidate-check_signature
+++ a/include/asm-sparc64/io.h
@@ -440,21 +440,6 @@ _memcpy_toio(volatile void __iomem *dst,
#define memcpy_toio(d,s,sz) _memcpy_toio(d,s,sz)
-static inline int check_signature(void __iomem *io_addr,
- const unsigned char *signature,
- int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature++)
- goto out;
- io_addr++;
- } while (--length);
- retval = 1;
-out:
- return retval;
-}
-
#define mmiowb()
#ifdef __KERNEL__
diff -puN include/asm-x86_64/io.h~consolidate-check_signature include/asm-x86_64/io.h
--- a/include/asm-x86_64/io.h~consolidate-check_signature
+++ a/include/asm-x86_64/io.h
@@ -254,33 +254,6 @@ void memset_io(volatile void __iomem *a,
#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d))
-/**
- * check_signature - find BIOS signatures
- * @io_addr: mmio address to check
- * @signature: signature block
- * @length: length of signature
- *
- * Perform a signature comparison with the mmio address io_addr. This
- * address should have been obtained by ioremap.
- * Returns 1 on a match.
- */
-
-static inline int check_signature(void __iomem *io_addr,
- const unsigned char *signature, int length)
-{
- int retval = 0;
- do {
- if (readb(io_addr) != *signature)
- goto out;
- io_addr++;
- signature++;
- length--;
- } while (length);
- retval = 1;
-out:
- return retval;
-}
-
/* Nothing to do */
#define dma_cache_inv(_start,_size) do { } while (0)
diff -puN include/linux/io.h~consolidate-check_signature include/linux/io.h
--- a/include/linux/io.h~consolidate-check_signature
+++ a/include/linux/io.h
@@ -28,4 +28,31 @@ void __iowrite64_copy(void __iomem *to,
int ioremap_page_range(unsigned long addr, unsigned long end,
unsigned long phys_addr, pgprot_t prot);
+/**
+ * check_signature - find BIOS signatures
+ * @io_addr: mmio address to check
+ * @signature: signature block
+ * @length: length of signature
+ *
+ * Perform a signature comparison with the mmio address io_addr. This
+ * address should have been obtained by ioremap.
+ * Returns 1 on a match.
+ */
+
+static inline int check_signature(const volatile void __iomem *io_addr,
+ const unsigned char *signature, int length)
+{
+ int retval = 0;
+ do {
+ if (readb(io_addr) != *signature)
+ goto out;
+ io_addr++;
+ signature++;
+ length--;
+ } while (length);
+ retval = 1;
+out:
+ return retval;
+}
+
#endif /* _LINUX_IO_H */
_
Patches currently in -mm which might be from matthew@xxxxxx are
origin.patch
git-dvb.patch
git-scsi-misc.patch
extract-and-implement-are-bit-field-manipulation-routines.patch
make-sure-nobodys-leaking-resources.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
