mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
linux: generic: add support for 3.1-rc1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27940 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jogo
133
target/linux/generic/patches-3.1/941-ocf_20110720.patch
Normal file
133
target/linux/generic/patches-3.1/941-ocf_20110720.patch
Normal file
@@ -0,0 +1,133 @@
|
||||
--- a/kernel/pid.c
|
||||
+++ b/kernel/pid.c
|
||||
@@ -426,6 +426,7 @@ struct task_struct *find_task_by_vpid(pi
|
||||
{
|
||||
return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
|
||||
}
|
||||
+EXPORT_SYMBOL(find_task_by_vpid);
|
||||
|
||||
struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
|
||||
{
|
||||
--- a/drivers/char/random.c
|
||||
+++ b/drivers/char/random.c
|
||||
@@ -130,6 +130,9 @@
|
||||
* void add_interrupt_randomness(int irq);
|
||||
* void add_disk_randomness(struct gendisk *disk);
|
||||
*
|
||||
+ * void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
|
||||
+ * int random_input_wait(void);
|
||||
+ *
|
||||
* add_input_randomness() uses the input layer interrupt timing, as well as
|
||||
* the event type information from the hardware.
|
||||
*
|
||||
@@ -147,6 +150,13 @@
|
||||
* seek times do not make for good sources of entropy, as their seek
|
||||
* times are usually fairly consistent.
|
||||
*
|
||||
+ * random_input_words() just provides a raw block of entropy to the input
|
||||
+ * pool, such as from a hardware entropy generator.
|
||||
+ *
|
||||
+ * random_input_wait() suspends the caller until such time as the
|
||||
+ * entropy pool falls below the write threshold, and returns a count of how
|
||||
+ * much entropy (in bits) is needed to sustain the pool.
|
||||
+ *
|
||||
* 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.
|
||||
@@ -722,6 +732,63 @@ void add_disk_randomness(struct gendisk
|
||||
}
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * random_input_words - add bulk entropy to pool
|
||||
+ *
|
||||
+ * @buf: buffer to add
|
||||
+ * @wordcount: number of __u32 words to add
|
||||
+ * @ent_count: total amount of entropy (in bits) to credit
|
||||
+ *
|
||||
+ * this provides bulk input of entropy to the input pool
|
||||
+ *
|
||||
+ */
|
||||
+void random_input_words(__u32 *buf, size_t wordcount, int ent_count)
|
||||
+{
|
||||
+ mix_pool_bytes(&input_pool, buf, wordcount*4);
|
||||
+
|
||||
+ credit_entropy_bits(&input_pool, ent_count);
|
||||
+
|
||||
+ DEBUG_ENT("crediting %d bits => %d\n",
|
||||
+ ent_count, input_pool.entropy_count);
|
||||
+ /*
|
||||
+ * Wake up waiting processes if we have enough
|
||||
+ * entropy.
|
||||
+ */
|
||||
+ if (input_pool.entropy_count >= random_read_wakeup_thresh)
|
||||
+ wake_up_interruptible(&random_read_wait);
|
||||
+}
|
||||
+EXPORT_SYMBOL(random_input_words);
|
||||
+
|
||||
+/*
|
||||
+ * random_input_wait - wait until random needs entropy
|
||||
+ *
|
||||
+ * this function sleeps until the /dev/random subsystem actually
|
||||
+ * needs more entropy, and then return the amount of entropy
|
||||
+ * that it would be nice to have added to the system.
|
||||
+ */
|
||||
+int random_input_wait(void)
|
||||
+{
|
||||
+ int count;
|
||||
+
|
||||
+ wait_event_interruptible(random_write_wait,
|
||||
+ input_pool.entropy_count < random_write_wakeup_thresh);
|
||||
+
|
||||
+ count = random_write_wakeup_thresh - input_pool.entropy_count;
|
||||
+
|
||||
+ /* likely we got woken up due to a signal */
|
||||
+ if (count <= 0) count = random_read_wakeup_thresh;
|
||||
+
|
||||
+ DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n",
|
||||
+ count,
|
||||
+ input_pool.entropy_count, random_write_wakeup_thresh);
|
||||
+
|
||||
+ return count;
|
||||
+}
|
||||
+EXPORT_SYMBOL(random_input_wait);
|
||||
+
|
||||
+
|
||||
+#define EXTRACT_SIZE 10
|
||||
+
|
||||
/*********************************************************************
|
||||
*
|
||||
* Entropy extraction routines
|
||||
--- a/fs/fcntl.c
|
||||
+++ b/fs/fcntl.c
|
||||
@@ -142,6 +142,7 @@ SYSCALL_DEFINE1(dup, unsigned int, filde
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
+EXPORT_SYMBOL(sys_dup);
|
||||
|
||||
#define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME)
|
||||
|
||||
--- a/include/linux/miscdevice.h
|
||||
+++ b/include/linux/miscdevice.h
|
||||
@@ -18,6 +18,7 @@
|
||||
#define APOLLO_MOUSE_MINOR 7
|
||||
#define PC110PAD_MINOR 9
|
||||
/*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */
|
||||
+#define CRYPTODEV_MINOR 70 /* /dev/crypto */
|
||||
#define WATCHDOG_MINOR 130 /* Watchdog timer */
|
||||
#define TEMP_MINOR 131 /* Temperature Sensor */
|
||||
#define RTC_MINOR 135
|
||||
--- a/include/linux/random.h
|
||||
+++ b/include/linux/random.h
|
||||
@@ -54,6 +54,10 @@ extern void add_input_randomness(unsigne
|
||||
unsigned int value);
|
||||
extern void add_interrupt_randomness(int irq);
|
||||
|
||||
+extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count);
|
||||
+extern int random_input_wait(void);
|
||||
+#define HAS_RANDOM_INPUT_WAIT 1
|
||||
+
|
||||
extern void get_random_bytes(void *buf, int nbytes);
|
||||
void generate_random_uuid(unsigned char uuid_out[16]);
|
||||
|
||||
Reference in New Issue
Block a user