Linux 2.6.27.39
Subsystems (23)
I'm announcing the release of the 2.6.27.39 kernel. All users of the 2.6.27 kernel series are very strongly encouraged to upgrade.
The updated 2.6.27.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.27.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=summarythanks,
greg k-h
------------
Makefile | 2 - arch/m68k/Kconfig | 6 ++-- arch/x86/ia32/ia32entry.S | 5 +-- arch/x86/kernel/amd_iommu_init.c | 25 ++++++++++++++++- arch/x86/kvm/x86.c | 2 + drivers/acpi/scan.c | 12 +------- drivers/ata/libata-core.c | 12 ++++---- drivers/base/driver.c | 2 - drivers/char/Kconfig | 6 ++-- drivers/input/mouse/synaptics.c | 10 +++++++ drivers/net/appletalk/ipddp.c | 3 -- drivers/net/bonding/bond_main.c | 2 - drivers/net/wireless/b43/rfkill.c | 3 +- drivers/net/wireless/libertas/if_usb.c | 2 - drivers/net/wireless/ray_cs.c | 2 - drivers/scsi/dpt_i2o.c | 4 ++ drivers/serial/8250_pci.c | 11 +++++++ fs/hfsplus/wrapper.c | 4 ++ fs/nfs/client.c | 2 - fs/nfs/dir.c | 4 ++ fs/nfs/direct.c | 1 fs/nfs/nfs4proc.c | 27 ++++++++++++++---- fs/nfs/nfs4renewd.c | 6 ---- fs/nfs/nfs4xdr.c | 1 fs/nfs/super.c | 1 fs/pipe.c | 41 +++++++++++++++++++++------- include/linux/kernel.h | 4 ++ include/linux/pci_ids.h | 3 ++ include/net/irda/irda_device.h | 4 ++ kernel/printk.c | 19 +++++++++++-- kernel/time/tick-sched.c | 2 - kernel/timer.c | 1 mm/mempolicy.c | 3 +- net/appletalk/aarp.c | 16 +++++++---- net/appletalk/ddp.c | 47 ++++++++++++++++----------------- net/sched/cls_api.c | 2 - net/unix/af_unix.c | 2 + 37 files changed, 204 insertions(+), 95 deletions(-)
Alan Cox (3):
dpt_i2o: Fix up copy*user
ray_cs: Fix copy_from_user handling
tty: Mark generic_serial users as BROKEN
Arnaldo Carvalho de Melo (1):
appletalk: Fix skb leak when ipddp interface is not loaded (CVE-2009-2903)
Avi Kivity (1):
KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID (CVE-2009-3638)
Ben Hutchings (2):
hfsplus: refuse to mount volumes larger than 2TB
nfs: Avoid overrun when copying client IP address string
Benjamin Herrenschmidt (1):
8250_pci: add IBM Saturn serial card
David Woodhouse (1):
libertas if_usb: Fix crash on 64-bit machines
Dmitry Torokhov (1):
Input: synaptics - add another Protege M300 to rate blacklist
Earl Chew (1):
fs: pipe.c null pointer dereference
Greg Kroah-Hartman (1):
Linux 2.6.27.39
Jan Beulich (1):
x86-64: Fix register leak in 32-bit syscall audting
Jiri Bohac (1):
bonding: fix a race condition in calls to slave MII ioctls
Jiri Pirko (1):
netlink: fix typo in initialization (CVE-2009-3612)
Joerg Roedel (2):
x86/amd-iommu: Un__init function required on shutdown x86/amd-iommu: Workaround for erratum 63
KOSAKI Motohiro (1):
mbind(): fix leak of never putback pages
Larry Finger (1):
b43: Fix Bugzilla #14181 and the bug from the previous 'fix'
Len Brown (1):
Revert "ACPI: Attach the ACPI device to the ACPI handle as early as possible"
OGAWA Hirofumi (1):
dpt_i2o: Fix typo of EINVAL
Peter Zijlstra (1):
printk: robustify printk
Samuel Ortiz (1):
irda: Add irda_skb_cb qdisc related padding
Stas Sergeev (1):
Driver core: fix driver_register() return value
Tejun Heo (1):
libata: fix internal command failure handling
Terry Loftin (1):
nfs: Panic when commit fails
Tomoki Sekiyama (1):
AF_UNIX: Fix deadlock on connecting to shutdown socket (CVE-2009-3621)
Trond Myklebust (4):
NFSv4: Fix a bug when the server returns NFS4ERR_RESOURCE
NFSv4: Kill nfs4_renewd_prepare_shutdown()
NFSv4: Fix a problem whereby a buggy server can oops the kernel
NFSv4: The link() operation should return any delegation on the file
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 27 -EXTRAVERSION = .38 +EXTRAVERSION = .39 NAME = Trembling Tortoise # *DOCUMENTATION*
arch/m68k/Kconfig +3 -3
@@ -572,7 +572,7 @@ config HPAPCI config MVME147_SCC bool "SCC support for MVME147 serial ports" - depends on MVME147 + depends on MVME147 && BROKEN help This is the driver for the serial ports on the Motorola MVME147 boards. Everyone using one of these boards should say Y here.
@@ -587,14 +587,14 @@ config SERIAL167 config MVME162_SCC bool "SCC support for MVME162 serial ports" - depends on MVME16x + depends on MVME16x && BROKEN help This is the driver for the serial ports on the Motorola MVME162 and 172 boards. Everyone using one of these boards should say Y here. config BVME6000_SCC bool "SCC support for BVME6000 serial ports" - depends on BVME6000 + depends on BVME6000 && BROKEN help This is the driver for the serial ports on the BVME4000 and BVME6000 boards from BVM Ltd. Everyone using one of these boards should say
arch/x86/ia32/ia32entry.S +2 -3
@@ -204,7 +204,7 @@ sysexit_from_sys_call: movl RDI-ARGOFFSET(%rsp),%r8d /* reload 5th syscall arg */ .endm - .macro auditsys_exit exit,ebpsave=RBP + .macro auditsys_exit exit testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10) jnz ia32_ret_from_sys_call TRACE_IRQS_ON
@@ -217,7 +217,6 @@ sysexit_from_sys_call: call audit_syscall_exit GET_THREAD_INFO(%r10) movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */ - movl \ebpsave-ARGOFFSET(%rsp),%ebp /* reload user register value */ movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi cli TRACE_IRQS_OFF
@@ -351,7 +350,7 @@ cstar_auditsys: jmp cstar_dispatch sysretl_audit: - auditsys_exit sysretl_from_sys_call, RCX /* user %ebp in RCX slot */ + auditsys_exit sysretl_from_sys_call #endif cstar_tracesys:
arch/x86/kernel/amd_iommu_init.c +24 -1
@@ -230,7 +230,7 @@ static void __init iommu_feature_enable(struct amd_iommu *iommu, u8 bit)writel (ctrl, iommu->mmio_base +MMIO_CONTROL_OFFSET ); } -static void __init iommu_feature_disable (struct amd_iommu *iommu,u8 bit) +static void iommu_feature_disable (struct amd_iommu *iommu,u8 bit) {u32 ctrl;
@@ -430,6 +430,27 @@ static void set_dev_entry_bit(u16 devid, u8 bit) amd_iommu_dev_table[devid].data[i] |= (1 << _bit); } +static int get_dev_entry_bit (u16 devid,u8 bit) +{ +int i = (bit >>5 ) &0x07 ; +int _bit = bit &0x1f ; + +return (amd_iommu_dev_table[devid].data[i] & (1 << _bit)) >> _bit; +} + + +void amd_iommu_apply_erratum_63 (u16 devid) +{ +int sysmgt; + + sysmgt =get_dev_entry_bit (devid,DEV_ENTRY_SYSMGT1 ) | + (get_dev_entry_bit (devid,DEV_ENTRY_SYSMGT2 ) <<1 ); + +if (sysmgt ==0x01 ) +set_dev_entry_bit (devid,DEV_ENTRY_IW ); +} + +/* Writes the specific IOMMU for a device into the rlookup table */ static void __init set_iommu_for_device (struct amd_iommu *iommu,u16 devid) {
@@ -458,6 +479,8 @@ static void __init set_dev_entry_from_acpi(struct amd_iommu *iommu,if (flags &ACPI_DEVFLAG_LINT1 )set_dev_entry_bit (devid,DEV_ENTRY_LINT1_PASS ); +amd_iommu_apply_erratum_63 (devid); +set_iommu_for_device (iommu, devid); }
arch/x86/kvm/x86.c +2 -0
@@ -1223,6 +1223,8 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,if (cpuid->nent <1 ) goto out; +if (cpuid->nent >KVM_MAX_CPUID_ENTRIES ) + cpuid->nent =KVM_MAX_CPUID_ENTRIES ; r = -ENOMEM ; cpuid_entries =vmalloc (sizeof (struct kvm_cpuid_entry2 ) * cpuid->nent);if (!cpuid_entries)
drivers/acpi/scan.c +2 -10
@@ -1262,16 +1262,6 @@ acpi_add_single_object(struct acpi_device **child,acpi_device_set_id (device, parent, handle, type);/* -* The ACPI device is attached to acpi handle before getting -* the power/wakeup/peformance flags. Otherwise OS can't get -* the corresponding ACPI device by the acpi handle in the course -* of getting the power/wakeup/performance flags. -*/ - result =acpi_device_set_context (device, type); -if (result) - goto end; - -/* * Power Management * ---------------- */
@@ -1301,6 +1291,8 @@ acpi_add_single_object(struct acpi_device **child, goto end; } +if ((result =acpi_device_set_context (device, type))) + goto end; result =acpi_device_register (device, parent);
drivers/ata/libata-core.c +7 -5
@@ -4747,12 +4747,14 @@ void ata_qc_complete(struct ata_queued_cmd *qc) qc->flags |=ATA_QCFLAG_FAILED ;if (unlikely (qc->flags &ATA_QCFLAG_FAILED )) { -if (!ata_tag_internal (qc->tag)) { -/* always fill result TF for failed qc */ -fill_result_tf (qc); +/* always fill result TF for failed qc */ +fill_result_tf (qc); + +if (!ata_tag_internal (qc->tag))ata_qc_schedule_eh (qc); -return ; - } +else +__ata_qc_complete (qc); +return ; }/* read result TF if requested */
drivers/base/driver.c +1 -1
@@ -227,7 +227,7 @@ int driver_register(struct device_driver *drv)put_driver (other);printk (KERN_ERR "Error: Driver '%s' is already registered, " "aborting...\n" , drv->name); -return -EEXIST ; +return -EBUSY ; } ret =bus_add_driver (drv);
drivers/char/Kconfig +3 -3
@@ -310,7 +310,7 @@ config SPECIALIX config SX tristate "Specialix SX (and SI) card support" - depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) + depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA) && BROKEN help This is a driver for the SX and SI multiport serial cards. Please read the file <file:Documentation/sx.txt> for details.
@@ -321,7 +321,7 @@ config SX config RIO tristate "Specialix RIO system support" - depends on SERIAL_NONSTANDARD + depends on SERIAL_NONSTANDARD && BROKEN help This is a driver for the Specialix RIO, a smart serial card which drives an outboard box that can support up to 128 ports. Product
@@ -382,7 +382,7 @@ config NOZOMI config A2232 tristate "Commodore A2232 serial support (EXPERIMENTAL)" - depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP + depends on EXPERIMENTAL && ZORRO && BROKEN ---help--- This option supports the 2232 7-port serial card shipped with the Amiga 2000 and other Zorro-bus machines, dating from 1989. At
drivers/input/mouse/synaptics.c +10 -0
@@ -623,6 +623,16 @@ static const struct dmi_system_id toshiba_dmi_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), }, + + }, + { + .ident = "Toshiba Portege M300", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"), + }, + }, { } };
drivers/net/appletalk/ipddp.c +1 -2
@@ -173,8 +173,7 @@ static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) ((struct net_device_stats *) dev->priv)->tx_packets++; ((struct net_device_stats *) dev->priv)->tx_bytes+=skb->len; -if (aarp_send_ddp (rt->dev, skb, &rt->at,NULL ) <0 ) -dev_kfree_skb (skb); +aarp_send_ddp (rt->dev, skb, &rt->at,NULL );return 0 ; }
drivers/net/bonding/bond_main.c +1 -1
@@ -686,7 +686,7 @@ static int bond_update_speed_duplex(struct slave *slave)*/ static int bond_check_dev_link (struct bonding *bond,struct net_device *slave_dev,int reporting) { -static int (* ioctl)(struct net_device *,struct ifreq *,int ); +int (* ioctl)(struct net_device *,struct ifreq *,int );struct ifreq ifr;struct mii_ioctl_data *mii;
drivers/net/wireless/b43/rfkill.c +2 -1
@@ -36,7 +36,8 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev) & B43_MMIO_RADIO_HWENABLED_HI_MASK))return 1 ; }else { -if (b43_read16 (dev,B43_MMIO_RADIO_HWENABLED_LO ) +if (b43_status (dev) >=B43_STAT_STARTED && +b43_read16 (dev,B43_MMIO_RADIO_HWENABLED_LO ) &B43_MMIO_RADIO_HWENABLED_LO_MASK )return 1 ; }
drivers/net/wireless/libertas/if_usb.c +1 -1
@@ -443,7 +443,7 @@ static int __if_usb_submit_rx_urb(struct if_usb_card *cardp,/* Fill the receive configuration URB and initialise the Rx call back */ usb_fill_bulk_urb (cardp->rx_urb, cardp->udev,usb_rcvbulkpipe (cardp->udev, cardp->ep_in), - (void *) (skb->tail + (size_t )IPFIELD_ALIGN_OFFSET ), + skb->data +IPFIELD_ALIGN_OFFSET ,MRVDRV_ETH_RX_PACKET_BUFFER_SIZE , callbackfn, cardp);
drivers/net/wireless/ray_cs.c +1 -1
@@ -2758,7 +2758,7 @@ static void raycs_write(const char *name, write_proc_t *w, void *data)static int write_essid (struct file *file,const char __user *buffer,unsigned long count,void *data) {static char proc_essid[33 ]; -int len = count; +unsigned int len = count;if (len >32 ) len =32 ;
drivers/scsi/dpt_i2o.c +4 -0
@@ -1918,6 +1918,10 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg) } size = size>>16 ; size *=4 ; +if (size >MAX_MESSAGE_SIZE ) { + rcode = -EINVAL ; + goto cleanup; + }/* Copy in the user's I2O command */ if (copy_from_user (msg, user_msg, size)) { rcode = -EFAULT ;
drivers/serial/8250_pci.c +11 -0
@@ -1218,6 +1218,7 @@ enum pci_board_num_t { pbn_exar_XR17C152, pbn_exar_XR17C154, pbn_exar_XR17C158, + pbn_exar_ibm_saturn, pbn_pasemi_1682M, };
@@ -1746,6 +1747,13 @@ static struct pciserial_board pci_boards[] __devinitdata = { .base_baud = 921600, .uart_offset = 0x200, }, + [pbn_exar_ibm_saturn] = { + .flags = FL_BASE0, + .num_ports = 1, + .base_baud = 921600, + .uart_offset = 0x200, + }, +/* * PA Semi PWRficient PA6T-1682M on-chip UART */
@@ -2217,6 +2225,9 @@ static struct pci_device_id serial_pci_tbl[] = {PCI_SUBVENDOR_ID_CONNECT_TECH ,PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485 ,0 ,0 , pbn_b0_8_1843200_200 }, + { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152, +PCI_VENDOR_ID_IBM ,PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT , + 0, 0, pbn_exar_ibm_saturn }, { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
fs/hfsplus/wrapper.c +4 -0
@@ -99,6 +99,10 @@ int hfsplus_read_wrapper(struct super_block *sb)if (hfsplus_get_last_session (sb, &part_start, &part_size))return -EINVAL ; +if ((u64 )part_start + part_size >0x100000000ULL ) { +pr_err ("hfs: volumes larger than 2TB are not supported yet\n" ); +return -EINVAL ; + }while (1 ) { bh =sb_bread512 (sb, part_start +HFSPLUS_VOLHEAD_SECTOR , vhdr);if (!bh)
fs/nfs/client.c +1 -1
@@ -983,7 +983,7 @@ static int nfs4_init_client(struct nfs_client *clp, RPC_CLNT_CREATE_DISCRTRY);if (error <0 ) goto error; -memcpy (clp->cl_ipaddr, ip_addr,sizeof (clp->cl_ipaddr)); +strlcpy (clp->cl_ipaddr, ip_addr,sizeof (clp->cl_ipaddr)); error =nfs_idmap_new (clp);if (error <0 ) {
fs/nfs/dir.c +3 -1
@@ -1014,12 +1014,12 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry res =NULL ; goto out;/* This turned out not to be a regular file */ -case -EISDIR :case -ENOTDIR : goto no_open;case -ELOOP :if (!(nd->intent.open.flags &O_NOFOLLOW )) goto no_open; +/* case -EISDIR: */ /* case -EINVAL: */ default : goto out;
@@ -1526,6 +1526,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) old_dentry->d_parent->d_name.name, old_dentry->d_name.name, dentry->d_parent->d_name.name, dentry->d_name.name); +nfs_inode_return_delegation (inode); +d_drop (dentry); error =NFS_PROTO (dir)->link (inode, dir, &dentry->d_name);if (error ==0 ) {
fs/nfs/direct.c +1 -0
@@ -454,6 +454,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) };struct rpc_task_setup task_setup_data = { .rpc_client =NFS_CLIENT (inode), + .rpc_message = &msg, .callback_ops = &nfs_write_direct_ops, .workqueue = nfsiod_workqueue, .flags =RPC_TASK_ASYNC ,
fs/nfs/nfs4proc.c +20 -7
@@ -71,12 +71,17 @@ static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,/* Prevent leaks of NFSv4 errors into userland */ int nfs4_map_errors (int err) { -if (err <-1000 ) { +if (err >=-1000 ) +return err; +switch (err) { +case -NFS4ERR_RESOURCE : +return -EREMOTEIO ; +default :dprintk ("%s could not handle NFSv4 error %d\n" , __func__, -err); -return -EIO ; +break ; } -return err; +return -EIO ; }/*
@@ -3550,15 +3555,23 @@ nfs4_proc_lock(struct file *filp, int cmd, struct file_lock *request)if (request->fl_start <0 || request->fl_end <0 )return -EINVAL ; -if (IS_GETLK (cmd)) -return nfs4_proc_getlk (state,F_GETLK , request); +if (IS_GETLK (cmd)) { +if (state !=NULL ) +return nfs4_proc_getlk (state,F_GETLK , request); +return 0 ; + }if (!(IS_SETLK (cmd) ||IS_SETLKW (cmd)))return -EINVAL ; -if (request->fl_type ==F_UNLCK ) -return nfs4_proc_unlck (state, cmd, request); +if (request->fl_type ==F_UNLCK ) { +if (state !=NULL ) +return nfs4_proc_unlck (state, cmd, request); +return 0 ; + } +if (state ==NULL ) +return -ENOLCK ; do { status = nfs4_proc_setlk(state, cmd, request); if ((status != -EAGAIN) || IS_SETLK(cmd))
fs/nfs/nfs4renewd.c +0 -6
@@ -125,12 +125,6 @@ nfs4_schedule_state_renewal(struct nfs_client *clp) }void -nfs4_renewd_prepare_shutdown (struct nfs_server *server) -{ -cancel_delayed_work (&server->nfs_client->cl_renewd); -} - -void nfs4_kill_renewd (struct nfs_client *clp) {cancel_delayed_work_sync (&clp->cl_renewd);
fs/nfs/nfs4xdr.c +0 -1
@@ -4671,7 +4671,6 @@ static struct { { NFS4ERR_SERVERFAULT, -ESERVERFAULT }, { NFS4ERR_BADTYPE, -EBADTYPE }, { NFS4ERR_LOCKED, -EAGAIN }, - { NFS4ERR_RESOURCE, -EREMOTEIO }, { NFS4ERR_SYMLINK, -ELOOP }, { NFS4ERR_OP_ILLEGAL, -EOPNOTSUPP }, { NFS4ERR_DEADLOCK, -EDEADLK },
fs/nfs/super.c +0 -1
@@ -2398,7 +2398,6 @@ static void nfs4_kill_super(struct super_block *sb)nfs_return_all_delegations (sb);kill_anon_super (sb); -nfs4_renewd_prepare_shutdown (server);nfs_free_server (server); }
fs/pipe.c +30 -11
66 lines not on this page · raw message
include/linux/kernel.h +4 -0
@@ -200,6 +200,8 @@ extern struct ratelimit_state printk_ratelimit_state;extern int printk_ratelimit (void );extern bool printk_timed_ratelimit (unsigned long *caller_jiffies,unsigned int interval_msec); +extern void printk_tick (void ); +extern int printk_needs_cpu (int );#else static inline int vprintk (const char *s,va_list args) __attribute__ ((format (printf,1 ,0 )));
@@ -211,6 +213,8 @@ static inline int printk_ratelimit(void) { return 0; }static inline bool printk_timed_ratelimit (unsigned long *caller_jiffies, \unsigned int interval_msec) \ {return false; } +static inline void printk_tick (void ) { } +static inline int printk_needs_cpu (int ) {return 0 ; }#endif extern void asmlinkage __attribute__((format(printf, 1, 2)))
include/linux/pci_ids.h +3 -0
@@ -478,6 +478,9 @@#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252 +#define PCI_SUBVENDOR_ID_IBM 0x1014 +#define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT 0x03d4 +#define PCI_VENDOR_ID_UNISYS 0x1018#define PCI_DEVICE_ID_UNISYS_DMA_DIRECTOR 0x001C
include/net/irda/irda_device.h +3 -1
@@ -135,9 +135,11 @@ struct dongle_reg {/* * Per-packet information we need to hide inside sk_buff -* (must not exceed 48 bytes, check with struct sk_buff) +* (must not exceed 48 bytes, check with struct sk_buff) +* The default_qdisc_pad field is a temporary hack. */ struct irda_skb_cb { +unsigned int default_qdisc_pad;magic_t magic;/* Be sure that we can trust the information */ __u32 next_speed;/* The Speed to be set *after* this frame */ __u16 mtt;/* Minimum turn around time */
kernel/printk.c +17 -2
@@ -977,10 +977,25 @@ int is_console_locked(void)return console_locked; } -void wake_up_klogd (void ) +static DEFINE_PER_CPU(int, printk_pending); + +void printk_tick (void ) { -if (!oops_in_progress &&waitqueue_active (&log_wait)) +if (__get_cpu_var (printk_pending)) { +__get_cpu_var (printk_pending) =0 ;wake_up_interruptible (&log_wait); + } +} + +int printk_needs_cpu (int cpu) +{ +return per_cpu (printk_pending, cpu); +} + +void wake_up_klogd (void ) +{ +if (waitqueue_active (&log_wait)) +__get_cpu_var (printk_pending) =1 ; }/**
kernel/time/tick-sched.c +1 -1
@@ -261,7 +261,7 @@ void tick_nohz_stop_sched_tick(int inidle) next_jiffies =get_next_timer_interrupt (last_jiffies); delta_jiffies = next_jiffies - last_jiffies; -if (rcu_needs_cpu (cpu)) +if (rcu_needs_cpu (cpu) ||printk_needs_cpu (cpu)) delta_jiffies =1 ;/* * Do not stop the tick, if we are only one off
kernel/timer.c +1 -0
@@ -978,6 +978,7 @@ void update_process_times(int user_tick)run_local_timers ();if (rcu_pending (cpu))rcu_check_callbacks (cpu, user_tick); +printk_tick ();scheduler_tick ();run_posix_cpu_timers (p); }
mm/mempolicy.c +2 -1
@@ -985,7 +985,8 @@ static long do_mbind(unsigned long start, unsigned long len,if (!err && nr_failed && (flags &MPOL_MF_STRICT )) err = -EIO ; - } + }else +putback_lru_pages (&pagelist);up_write (&mm->mmap_sem);mpol_put (new);
net/appletalk/aarp.c +11 -5
@@ -598,7 +598,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,/* Non ELAP we cannot do. */ if (dev->type !=ARPHRD_ETHER ) -return -1 ; + goto free_it; skb->dev = dev; skb->protocol =htons (ETH_P_ATALK );
@@ -633,7 +633,7 @@ int aarp_send_ddp(struct net_device *dev, struct sk_buff *skb,if (!a) {/* Whoops slipped... good job it's an unreliable protocol 8) */ write_unlock_bh (&aarp_lock); -return -1 ; + goto free_it; }/* Set up the queue */
@@ -662,15 +662,21 @@ out_unlock:write_unlock_bh (&aarp_lock);/* Tell the ddp layer we have taken over for this frame. */ -return 0 ; + goto sent; sendit:if (skb->sk) skb->priority = skb->sk->sk_priority; -dev_queue_xmit (skb); +if (dev_queue_xmit (skb)) + goto drop; sent: -return 1 ; +return NET_XMIT_SUCCESS ; +free_it: +kfree_skb (skb); +drop: +return NET_XMIT_DROP ; } +EXPORT_SYMBOL (aarp_send_ddp);/* * An entry in the aarp unresolved queue has become resolved. Send
net/appletalk/ddp.c +24 -23
103 lines not on this page · raw message
net/sched/cls_api.c +1 -1
@@ -337,7 +337,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, tcm =NLMSG_DATA (nlh); tcm->tcm_family =AF_UNSPEC ; tcm->tcm__pad1 =0 ; - tcm->tcm__pad1 =0 ; + tcm->tcm__pad2 =0 ; tcm->tcm_ifindex =qdisc_dev (tp->q)->ifindex; tcm->tcm_parent = tp->classid; tcm->tcm_info =TC_H_MAKE (tp->prio, tp->protocol);
net/unix/af_unix.c +2 -0
@@ -1061,6 +1061,8 @@ restart: err = -ECONNREFUSED ;if (other->sk_state !=TCP_LISTEN ) goto out_unlock; +if (other->sk_shutdown &RCV_SHUTDOWN ) + goto out_unlock;if (unix_recvq_full (other)) { err = -EAGAIN ;