source: trunk/target/linux/generic/patches-2.6.30/971-ocf_20110720.patch @ 27952

Last change on this file since 27952 was 27952, checked in by jogo, 5 years ago

kernel: 2.6.30: remove bogus additional find_task_by_vpid export from OCF

find_task_by_vpid is already exported, thus breaking builds.

File size: 3.8 KB
  • drivers/char/random.c

    a b  
    129129 *                                unsigned int value); 
    130130 *      void add_interrupt_randomness(int irq); 
    131131 * 
     132 *      void random_input_words(__u32 *buf, size_t wordcount, int ent_count) 
     133 *      int random_input_wait(void); 
     134 * 
    132135 * add_input_randomness() uses the input layer interrupt timing, as well as 
    133136 * the event type information from the hardware. 
    134137 * 
     
    140143 * a better measure, since the timing of the disk interrupts are more 
    141144 * unpredictable. 
    142145 * 
     146 * random_input_words() just provides a raw block of entropy to the input 
     147 * pool, such as from a hardware entropy generator. 
     148 * 
     149 * random_input_wait() suspends the caller until such time as the 
     150 * entropy pool falls below the write threshold, and returns a count of how 
     151 * much entropy (in bits) is needed to sustain the pool. 
     152 * 
    143153 * All of these routines try to estimate how many bits of randomness a 
    144154 * particular randomness source.  They do this by keeping track of the 
    145155 * first and second order deltas of the event timings. 
    void add_disk_randomness(struct gendisk 
    712722} 
    713723#endif 
    714724 
     725/* 
     726 * random_input_words - add bulk entropy to pool 
     727 * 
     728 * @buf: buffer to add 
     729 * @wordcount: number of __u32 words to add 
     730 * @ent_count: total amount of entropy (in bits) to credit 
     731 * 
     732 * this provides bulk input of entropy to the input pool 
     733 * 
     734 */ 
     735void random_input_words(__u32 *buf, size_t wordcount, int ent_count) 
     736{ 
     737        mix_pool_bytes(&input_pool, buf, wordcount*4); 
     738 
     739        credit_entropy_bits(&input_pool, ent_count); 
     740 
     741        DEBUG_ENT("crediting %d bits => %d\n", 
     742                  ent_count, input_pool.entropy_count); 
     743        /* 
     744         * Wake up waiting processes if we have enough 
     745         * entropy. 
     746         */ 
     747        if (input_pool.entropy_count >= random_read_wakeup_thresh) 
     748                wake_up_interruptible(&random_read_wait); 
     749} 
     750EXPORT_SYMBOL(random_input_words); 
     751 
     752/* 
     753 * random_input_wait - wait until random needs entropy 
     754 * 
     755 * this function sleeps until the /dev/random subsystem actually 
     756 * needs more entropy, and then return the amount of entropy 
     757 * that it would be nice to have added to the system. 
     758 */ 
     759int random_input_wait(void) 
     760{ 
     761        int count; 
     762 
     763        wait_event_interruptible(random_write_wait,  
     764                         input_pool.entropy_count < random_write_wakeup_thresh); 
     765 
     766        count = random_write_wakeup_thresh - input_pool.entropy_count; 
     767 
     768        /* likely we got woken up due to a signal */ 
     769        if (count <= 0) count = random_read_wakeup_thresh;  
     770 
     771        DEBUG_ENT("requesting %d bits from input_wait()er %d<%d\n", 
     772                  count, 
     773                  input_pool.entropy_count, random_write_wakeup_thresh); 
     774 
     775        return count; 
     776} 
     777EXPORT_SYMBOL(random_input_wait); 
     778 
     779 
    715780#define EXTRACT_SIZE 10 
    716781 
    717782/********************************************************************* 
  • fs/fcntl.c

    a b static int setfl(int fd, struct file * f 
    196196 out: 
    197197        return error; 
    198198} 
     199EXPORT_SYMBOL(sys_dup); 
    199200 
    200201static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, 
    201202                     uid_t uid, uid_t euid, int force) 
  • include/linux/miscdevice.h

    a b  
    1212#define APOLLO_MOUSE_MINOR      7 
    1313#define PC110PAD_MINOR          9 
    1414/*#define ADB_MOUSE_MINOR       10      FIXME OBSOLETE */ 
     15#define CRYPTODEV_MINOR         70      /* /dev/crypto */ 
    1516#define WATCHDOG_MINOR          130     /* Watchdog timer     */ 
    1617#define TEMP_MINOR              131     /* Temperature Sensor */ 
    1718#define RTC_MINOR               135 
  • include/linux/random.h

    a b extern void add_input_randomness(unsigne 
    5050                                 unsigned int value); 
    5151extern void add_interrupt_randomness(int irq); 
    5252 
     53extern void random_input_words(__u32 *buf, size_t wordcount, int ent_count); 
     54extern int random_input_wait(void); 
     55#define HAS_RANDOM_INPUT_WAIT 1 
     56 
    5357extern void get_random_bytes(void *buf, int nbytes); 
    5458void generate_random_uuid(unsigned char uuid_out[16]); 
    5559 
Note: See TracBrowser for help on using the repository browser.