The patch titled
random: remove SA_SAMPLE_RANDOM from floppy driver
has been removed from the -mm tree. Its filename is
random-remove-sa_sample_random-from-floppy-driver.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: random: remove SA_SAMPLE_RANDOM from floppy driver
From: Matt Mackall <mpm@xxxxxxxxxxx>
The floppy driver is already calling add_disk_randomness as it should, so this
was redundant.
Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-alpha/floppy.h | 5 ++---
include/asm-arm/floppy.h | 2 +-
include/asm-arm26/floppy.h | 2 +-
include/asm-i386/floppy.h | 5 ++---
include/asm-mips/mach-generic/floppy.h | 2 +-
include/asm-mips/mach-jazz/floppy.h | 2 +-
include/asm-parisc/floppy.h | 6 ++----
include/asm-powerpc/floppy.h | 3 +--
include/asm-ppc/floppy.h | 6 ++----
include/asm-sh/floppy.h | 7 +++----
include/asm-x86_64/floppy.h | 6 ++----
11 files changed, 18 insertions(+), 28 deletions(-)
diff -puN include/asm-alpha/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-alpha/floppy.h
--- a/include/asm-alpha/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-alpha/floppy.h
@@ -25,9 +25,8 @@
#define fd_enable_irq() enable_irq(FLOPPY_IRQ)
#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
#define fd_cacheflush(addr,size) /* nothing */
-#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \
- SA_INTERRUPT|SA_SAMPLE_RANDOM, \
- "floppy", NULL)
+#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt,\
+ SA_INTERRUPT, "floppy", NULL)
#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
#ifdef CONFIG_PCI
diff -puN include/asm-arm26/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-arm26/floppy.h
--- a/include/asm-arm26/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-arm26/floppy.h
@@ -22,7 +22,7 @@
#define fd_inb(port) inb((port))
#define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\
- SA_INTERRUPT|SA_SAMPLE_RANDOM,"floppy",NULL)
+ SA_INTERRUPT,"floppy",NULL)
#define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL)
#define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK)
#define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK)
diff -puN include/asm-arm/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-arm/floppy.h
--- a/include/asm-arm/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-arm/floppy.h
@@ -25,7 +25,7 @@
#define fd_inb(port) inb((port))
#define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\
- SA_INTERRUPT|SA_SAMPLE_RANDOM,"floppy",NULL)
+ SA_INTERRUPT,"floppy",NULL)
#define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL)
#define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK)
#define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK)
diff -puN include/asm-i386/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-i386/floppy.h
--- a/include/asm-i386/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-i386/floppy.h
@@ -147,9 +147,8 @@ static int fd_request_irq(void)
return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
"floppy", NULL);
else
- return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT|SA_SAMPLE_RANDOM,
- "floppy", NULL);
+ return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
+ "floppy", NULL);
}
diff -puN include/asm-mips/mach-generic/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-mips/mach-generic/floppy.h
--- a/include/asm-mips/mach-generic/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-mips/mach-generic/floppy.h
@@ -98,7 +98,7 @@ static inline void fd_disable_irq(void)
static inline int fd_request_irq(void)
{
return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL);
+ SA_INTERRUPT, "floppy", NULL);
}
static inline void fd_free_irq(void)
diff -puN include/asm-mips/mach-jazz/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-mips/mach-jazz/floppy.h
--- a/include/asm-mips/mach-jazz/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-mips/mach-jazz/floppy.h
@@ -90,7 +90,7 @@ static inline void fd_disable_irq(void)
static inline int fd_request_irq(void)
{
return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL);
+ SA_INTERRUPT, "floppy", NULL);
}
static inline void fd_free_irq(void)
diff -puN include/asm-parisc/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-parisc/floppy.h
--- a/include/asm-parisc/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-parisc/floppy.h
@@ -159,10 +159,8 @@ static int fd_request_irq(void)
return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
"floppy", NULL);
else
- return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT|SA_SAMPLE_RANDOM,
- "floppy", NULL);
-
+ return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
+ "floppy", NULL);
}
static unsigned long dma_mem_alloc(unsigned long size)
diff -puN include/asm-powerpc/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-powerpc/floppy.h
--- a/include/asm-powerpc/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-powerpc/floppy.h
@@ -27,8 +27,7 @@
#define fd_disable_irq() disable_irq(FLOPPY_IRQ)
#define fd_cacheflush(addr,size) /* nothing */
#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \
- SA_INTERRUPT|SA_SAMPLE_RANDOM, \
- "floppy", NULL)
+ SA_INTERRUPT, "floppy", NULL)
#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL);
#ifdef CONFIG_PCI
diff -puN include/asm-ppc/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-ppc/floppy.h
--- a/include/asm-ppc/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-ppc/floppy.h
@@ -99,10 +99,8 @@ static int fd_request_irq(void)
return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
"floppy", NULL);
else
- return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT|SA_SAMPLE_RANDOM,
- "floppy", NULL);
-
+ return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
+ "floppy", NULL);
}
static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io)
diff -puN include/asm-sh/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-sh/floppy.h
--- a/include/asm-sh/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-sh/floppy.h
@@ -147,11 +147,10 @@ static int fd_request_irq(void)
{
if(can_use_virtual_dma)
return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
- "floppy", NULL);
+ "floppy", NULL);
else
- return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT|SA_SAMPLE_RANDOM,
- "floppy", NULL);
+ return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
+ "floppy", NULL);
}
diff -puN include/asm-x86_64/floppy.h~random-remove-sa_sample_random-from-floppy-driver include/asm-x86_64/floppy.h
--- a/include/asm-x86_64/floppy.h~random-remove-sa_sample_random-from-floppy-driver
+++ a/include/asm-x86_64/floppy.h
@@ -147,10 +147,8 @@ static int fd_request_irq(void)
return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT,
"floppy", NULL);
else
- return request_irq(FLOPPY_IRQ, floppy_interrupt,
- SA_INTERRUPT|SA_SAMPLE_RANDOM,
- "floppy", NULL);
-
+ return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT,
+ "floppy", NULL);
}
static unsigned long dma_mem_alloc(unsigned long size)
_
Patches currently in -mm which might be from mpm@xxxxxxxxxxx are
origin.patch
netpoll-dont-spin-forever-sending-to-blocked-queues.patch
netpoll-break-recursive-loop-in-netpoll-rx-path.patch
random-remove-redundant-sa_sample_random-from-ninjascsi.patch
add-poisonh-and-patch-primary-users.patch
make-number-of-ide-interfaces-configurable.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
