aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-17 14:10:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-17 14:10:39 +0000
commitc5ef57706de0ef3e4ede1b404ef43510bb22e6d9 (patch)
tree2a14f0b332c80242d488f0de7b0c351b00ee9dea /target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
parent1d7a6ebc79e71dbc9085efab8205134bc769159b (diff)
downloadupstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.gz
upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.tar.bz2
upstream-c5ef57706de0ef3e4ede1b404ef43510bb22e6d9.zip
kernel: refresh patches
SVN-Revision: 22252
Diffstat (limited to 'target/linux/generic/patches-2.6.35/971-ocf_20100325.patch')
-rw-r--r--target/linux/generic/patches-2.6.35/971-ocf_20100325.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch b/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
index 9aa36bcd50..fe96d7937a 100644
--- a/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
+++ b/target/linux/generic/patches-2.6.35/971-ocf_20100325.patch
@@ -24,7 +24,7 @@
* All of these routines try to estimate how many bits of randomness a
* particular randomness source. They do this by keeping track of the
* first and second order deltas of the event timings.
-@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk
+@@ -715,6 +725,61 @@ void add_disk_randomness(struct gendisk
}
#endif
@@ -88,7 +88,7 @@
* Entropy extraction routines
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
-@@ -141,6 +141,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
+@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
}
return ret;
}
@@ -98,7 +98,7 @@
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
-@@ -12,6 +12,7 @@
+@@ -18,6 +18,7 @@
#define APOLLO_MOUSE_MINOR 7
#define PC110PAD_MINOR 9
/*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */
@@ -147,7 +147,7 @@
struct rand_pool_info {
int entropy_count;
int buf_size;
-@@ -50,6 +75,10 @@ extern void add_input_randomness(unsigne
+@@ -54,6 +79,10 @@ extern void add_input_randomness(unsigne
unsigned int value);
extern void add_interrupt_randomness(int irq);