Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel26-alx/patches-2.6.23-r1/0110-2.6.23.11-all-fixes.patch

    Annotation of /trunk/kernel26-alx/patches-2.6.23-r1/0110-2.6.23.11-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 658 - (hide annotations) (download)
    Mon Jun 23 21:39:39 2008 UTC (16 years ago) by niro
    File size: 1819 byte(s) 
    2.6.23-alx-r1: new default as we fix the via epia clocksource=tsc quircks
-linux-2.6.23.17
-fbcondecor-0.9.4
-squashfs-3.3
-unionfs-2.3.3
-ipw3945-1.2.2
-mptbase-vmware fix
    1 niro 658 diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
    2     index 72183bd..ec116df 100644
    3     --- a/drivers/char/apm-emulation.c
    4     +++ b/drivers/char/apm-emulation.c
    5     @@ -295,6 +295,7 @@ static int
    6     apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
    7     {
    8     struct apm_user *as = filp->private_data;
    9     + unsigned long flags;
    10     int err = -EINVAL;
    11    
    12     if (!as->suser || !as->writer)
    13     @@ -330,16 +331,10 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
    14     * Wait for the suspend/resume to complete. If there
    15     * are pending acknowledges, we wait here for them.
    16     */
    17     - freezer_do_not_count();
    18     + flags = current->flags;
    19    
    20     wait_event(apm_suspend_waitqueue,
    21     as->suspend_state == SUSPEND_DONE);
    22     -
    23     - /*
    24     - * Since we are waiting until the suspend is done, the
    25     - * try_to_freeze() in freezer_count() will not trigger
    26     - */
    27     - freezer_count();
    28     } else {
    29     as->suspend_state = SUSPEND_WAIT;
    30     mutex_unlock(&state_lock);
    31     @@ -367,10 +362,14 @@ apm_ioctl(struct inode * inode, struct file *filp, u_int cmd, u_long arg)
    32     * Wait for the suspend/resume to complete. If there
    33     * are pending acknowledges, we wait here for them.
    34     */
    35     - wait_event_freezable(apm_suspend_waitqueue,
    36     + flags = current->flags;
    37     +
    38     + wait_event_interruptible(apm_suspend_waitqueue,
    39     as->suspend_state == SUSPEND_DONE);
    40     }
    41    
    42     + current->flags = flags;
    43     +
    44     mutex_lock(&state_lock);
    45     err = as->suspend_result;
    46     as->suspend_state = SUSPEND_NONE;
    47     diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
    48     index eb57502..bc40377 100644
    49     --- a/net/bridge/br_fdb.c
    50     +++ b/net/bridge/br_fdb.c
    51     @@ -44,7 +44,7 @@ int __init br_fdb_init(void)
    52     return 0;
    53     }
    54    
    55     -void __exit br_fdb_fini(void)
    56     +void br_fdb_fini(void)
    57     {
    58     kmem_cache_destroy(br_fdb_cache);
    59     }