Linux 2.6.32.47
Subsystems (72)
I'm announcing the release of the 2.6.32.47 kernel.
All users of the 2.6.32 series must upgrade.
The updated 2.6.32.y git tree can be found at (NOTE THE ADDRESS CHANGE):
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-2.6.32.y and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=shortlog;h=refs/heads/linux-2.6.32.y
thanks,
greg k-h
------------
Documentation/stable_kernel_rules.txt | 4 Makefile | 2 arch/arm/mach-davinci/board-da850-evm.c | 28 ++ arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 - arch/mips/alchemy/mtx-1/platform.c | 9 arch/powerpc/kernel/pci_of_scan.c | 2 arch/powerpc/sysdev/mpic.c | 17 - arch/s390/kvm/kvm-s390.c | 14 + arch/sparc/include/asm/sigcontext.h | 14 + arch/sparc/kernel/Makefile | 1 arch/sparc/kernel/pcic.c | 4 arch/sparc/kernel/signal32.c | 184 +++++++++++-------- arch/sparc/kernel/signal_32.c | 172 ++++++++---------- arch/sparc/kernel/signal_64.c | 108 ++++------- arch/sparc/kernel/sigutil.h | 9 arch/sparc/kernel/sigutil_32.c | 120 ++++++++++++ arch/sparc/kernel/sigutil_64.c | 93 +++++++++ arch/um/drivers/ubd_kern.c | 31 +++ arch/x86/include/asm/processor.h | 23 ++ arch/x86/kernel/amd_iommu.c | 2 arch/x86/kernel/kprobes.c | 4 arch/x86/kernel/smpboot.c | 85 --------- arch/x86/kvm/svm.c | 1 arch/x86/kvm/vmx.c | 1 arch/x86/xen/smp.c | 10 + arch/x86/xen/time.c | 4 arch/x86/xen/xen-asm_32.S | 8 block/cfq-iosched.c | 264 +++++++++++++++++++++------- drivers/ata/ahci.c | 12 + drivers/base/sys.c | 6 drivers/block/xen-blkfront.c | 2 drivers/char/hvc_console.c | 8 drivers/char/tpm/tpm.c | 9 drivers/hid/hid-ids.h | 3 drivers/hid/usbhid/hid-quirks.c | 1 drivers/hwmon/w83627ehf.c | 15 + drivers/md/linear.h | 2 drivers/md/md.c | 12 + drivers/media/video/cx23885/cx23885-dvb.c | 2 drivers/media/video/uvc/uvc_driver.c | 2 drivers/media/video/uvc/uvc_video.c | 10 - drivers/media/video/uvc/uvcvideo.h | 2 drivers/net/cnic.c | 4 drivers/net/e1000/e1000_hw.c | 6 drivers/net/e1000e/netdev.c | 2 drivers/net/igb/igb_main.c | 2 drivers/net/igbvf/netdev.c | 2 drivers/net/irda/smsc-ircc2.c | 2 drivers/net/ixgbe/ixgbe_main.c | 2 drivers/net/rionet.c | 4 drivers/net/usb/asix.c | 4 drivers/net/wireless/b43/main.c | 3 drivers/net/wireless/rt2x00/rt2x00usb.c | 14 - drivers/platform/x86/thinkpad_acpi.c | 7 drivers/s390/cio/ccwgroup.c | 42 ++-- drivers/scsi/3w-9xxx.c | 2 drivers/scsi/aacraid/commsup.c | 2 drivers/scsi/ipr.c | 2 drivers/scsi/libiscsi_tcp.c | 14 - drivers/scsi/libsas/sas_expander.c | 14 - drivers/scsi/qla2xxx/qla_init.c | 3 drivers/scsi/qla2xxx/qla_isr.c | 1 drivers/staging/quatech_usb2/quatech_usb2.c | 9 drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/devio.c | 6 drivers/usb/core/quirks.c | 21 ++ drivers/usb/host/ehci-hub.c | 7 drivers/usb/host/fhci-sched.c | 19 +- drivers/usb/host/xhci-mem.c | 22 +- drivers/usb/mon/mon_bin.c | 2 drivers/usb/musb/musb_core.c | 1 drivers/usb/serial/ftdi_sio.c | 25 ++ drivers/usb/serial/ftdi_sio_ids.h | 13 + drivers/usb/serial/pl2303.c | 27 ++ drivers/usb/serial/pl2303.h | 5 drivers/usb/serial/qcserial.c | 2 drivers/usb/storage/transport.c | 34 ++- drivers/video/carminefb.c | 6 drivers/watchdog/mtx-1_wdt.c | 5 drivers/xen/events.c | 2 fs/cifs/cifssmb.c | 3 fs/eventpoll.c | 25 +- fs/ext4/ext4.h | 3 fs/ext4/extents.c | 1 fs/lockd/clntproc.c | 8 fs/nfsd/nfs4proc.c | 2 fs/nfsd/nfs4state.c | 2 fs/proc/base.c | 69 +++++-- fs/proc/kcore.c | 2 fs/splice.c | 3 include/linux/ext2_fs.h | 4 include/linux/ext3_fs.h | 4 include/linux/interrupt.h | 5 include/linux/iocontext.h | 5 include/linux/jiffies.h | 2 include/linux/sunrpc/sched.h | 4 include/net/scm.h | 5 kernel/irq/pm.c | 35 ++- kernel/kmod.c | 4 kernel/time.c | 2 lib/kobject_uevent.c | 2 mm/mmap.c | 20 +- net/9p/client.c | 13 - net/atm/br2684.c | 7 net/bluetooth/l2cap.c | 3 net/bluetooth/rfcomm/sock.c | 1 net/core/scm.c | 10 - net/core/skbuff.c | 8 net/ipv6/ip6_output.c | 2 net/ipv6/ip6_tunnel.c | 4 net/sched/sch_api.c | 14 - net/sunrpc/clnt.c | 3 net/sunrpc/sched.c | 1 net/wireless/nl80211.c | 9 net/wireless/reg.c | 1 net/x25/af_x25.c | 3 sound/pci/hda/patch_cirrus.c | 2 sound/pci/hda/patch_realtek.c | 6 sound/soc/codecs/ak4535.c | 10 - sound/soc/codecs/ak4642.c | 22 +- sound/soc/codecs/wm8940.c | 2 sound/soc/soc-jack.c | 2 122 files changed, 1318 insertions(+), 666 deletions(-)
Al Viro (1):
deal with races in /proc/*/{syscall,stack,personality}Alexandre Bounine (1):
drivers/net/rionet.c: fix ethernet address macros for LE platforms
Andrew Vasquez (1):
qla2xxx: Correct inadvertent loop state transitions during port-update handling.
Aneesh Kumar K.V (1):
fs/9p: Fid is not valid after a failed clunk.
Anton Blanchard (1):
ipr: Always initiate hard reset in kdump kernel
Artur Zimmer (1):
USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
Axel Lin (2):
ASoC: wm8940: Properly set codec->dapm.bias_level
ASoC: ak4535: fixup cache register table
Bernd Schubert (1):
nfsd4: Remove check for a 32-bit cookie in nfsd4_readdir()
Carsten Otte (1):
KVM: s390: check cpu_id prior to using it
Changli Gao (1):
splice: direct_splice_actor() should not use pos in sd
Dan Carpenter (1):
kcore: fix test for end of list
Dan Rosenberg (1):
Bluetooth: Prevent buffer overflow in l2cap config request
Daniel Schwierzeck (1):
atm: br2684: Fix oops due to skb->dev being NULL
David Henningsson (2):
ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name
ALSA: HDA: Add new revision for ALC662
David S. Miller (1):
sparc: Allow handling signals when stack is corrupted.
Denis Pershin (1):
usb: cdc-acm: Owen SI-30 support
Eric Benoit (1):
USB: pl2303: add id for SMART device
Eric Dumazet (2):
scm: lower SCM_MAX_FD
net_sched: Fix qdisc_notify()
Eric Van Hensbergen (1):
net/9p: fix client code to fail more gracefully on protocol error
Filip Palian (1):
Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace.
Florian Echtler (1):
USB: Serial: Add device ID for Sierra Wireless MC8305
Florian Fainelli (2):
Revert "MIPS: MTX-1: Make au1000_eth probe all PHY
watchdog: mtx1-wdt: fix build failure
Greg Kroah-Hartman (3):
Revert "x86, hotplug: Use mwait to offline a processor, fix the legacy case" Revert "usb: musb: restore INDEX register in resume path"
Linux 2.6.32.47
Hakan Kvist (1):
USB: ftdi_sio: add PID for Sony Ericsson Urban
Hendrik Brueckner (1):
hvc_console: Improve tty/console put_chars handling
Herbert Xu (1):
ipv6: Add GSO support on forwarding path
Hugh Dickins (1):
vm: fix vm_pgoff wrap in upward expansion
Ian Campbell (3):
sparc: fix array bounds error setting up PCIC NMI trap xen/timer: Missing IRQF_NO_SUSPEND in timer code broke suspend.
genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
Igor Mammedov (1):
xen: x86_32: do not enable iterrupts when returning from exception in interrupt context
J. Bruce Fields (1):
nfsd4: ignore WANT bits in open downgrade
Jack Wang (1):
libsas: set sas_address and device type of rphy
James Bottomley (1):
3w-9xxx: fix iommu_iova leak
Jean Delvare (2):
hwmon: (w83627ehf) Properly report thermal diode sensors
carminefb: Fix module parameters permissions
Jean-Christophe PLAGNIOL-VILLARD (1):
USB: ftdi_sio: add Calao reference board support
Jeff Kirsher (1):
e1000: Fix driver to be used on PA RISC C8000 workstations
Jeff Layton (1):
cifs: fix possible memory corruption in CIFSFindNext
Jeff Moyer (5):
cfq: calculate the seek_mean per cfq_queue not per cfq_io_context
cfq: merge cooperating cfq_queues
cfq: change the meaning of the cfqq_coop flag
cfq: break apart merged cfqqs if they stop cooperating
cfq: Don't allow queue merges for queues that have no process references
Jens Axboe (1):
cfq-iosched: get rid of the coop_preempt flag
Jeremiah Matthey (1):
HID: usbhid: Add support for SiGma Micro chip
Jerry Huang (1):
QE/FHCI: fixed the CONTROL bug
Jiri Kosina (1):
kmod: prevent kmod_loop_msg overflow in __request_module()
Joerg Roedel (1):
iommu/amd: Fix wrong shift direction
Johannes Stezenbach (1):
usbmon vs. tcpdump: fix dropped packet count
Josh Boyer (1):
Update email address for stable patch submission
Josh Stone (1):
x86: Fix compilation bug in kprobes' twobyte_is_boostable
Jouni Malinen (1):
cfg80211: Fix validation of AKM suites
Kautuk Consul (2):
staging: quatech_usb2: Potential lost wakeup scenario in TIOCMIWAIT xhci-mem.c: Check for ring->first_seg != NULL
Konrad Rzeszutek Wilk (1):
xen/smp: Warn user why they keel over - nosmp or noapic and what to use instead.
Kuninori Morimoto (1):
ASoC: ak4642: fixup cache register table
Linus Torvalds (1):
vm: fix vm_pgoff wrap in stack expansion
Luben Tuikov (1):
USB: storage: Use normalized sense when emulating autosense
Luciano Coelho (1):
nl80211: fix overflow in ssid_len
Manoj Iyer (1):
thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
Manual Munz (1):
b43: Fix beacon problem in ad-hoc mode
Marek Marczykowski (1):
xen-blkfront: fix data size for xenbus_gather in blkfront_connect
Marek Vasut (1):
ASIX: Add AX88772B USB ID
Mark Brown (1):
ASoC: Fix reporting of partial jack updates
Mark Nelson (1):
ahci: Enable SB600 64bit DMA on Asus M3A
Mark Salyzyn (2):
libsas: fix failure to revalidate domain for anything but the first expander child.
libsas: fix panic when single phy is disabled on a wide port
Matthew Daley (1):
x25: Prevent skb overreads when checking call user data
Mauro Carvalho Chehab (1):
tuner_xc2028: Allow selection of the frequency adjustment code for XC3028
Michael Chan (1):
cnic: Improve NETDEV_UP event handling
Michal Schmidt (1):
GRO: fix merging a paged skb after non-paged skbs
Michal Sroczynski (1):
USB: PL2303: correctly handle baudrates above 115200
Mike Christie (1):
libiscsi_tcp: fix LLD data allocation
Milan Broz (1):
kobj_uevent: Ignore if some listeners cannot handle message
Ming Lei (1):
uvcvideo: Set alternate setting 0 on resume if the bus has been reset
NeilBrown (2):
md/linear: avoid corrupting structure while waiting for rcu_free to complete.
md: Fix handling for devices from 2TB to 4TB in 0.90 metadata.
Nelson Elhage (1):
epoll: fix spurious lockdep warnings
Oliver Neukum (1):
USB: add RESET_RESUME for webcams shown to be quirky
Paul Fertser (1):
plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
Peter Huewe (2):
TPM: Call tpm_transmit with correct size
TPM: Zero buffer after copying to userspace
Peter Stuge (1):
USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
Philipp Hahn (1):
KVM: x86: Reset tsc_timestamp on TSC writes
Rajkumar Manoharan (1):
wireless: Reset beacon_found while updating regulatory
Randy Dunlap (1):
irda: fix smsc-ircc2 section mismatch warning
Richard Weinberger (1):
um: fix ubd cow size
Rigbert Hamisch (1):
USB: qcserial: add device ID for "HP un2430 Mobile Broadband Module"
Sebastian Ott (1):
ccwgroup: move attributes to attribute group
Serge Hallyn (1):
USB: pid_ns: ensure pid is not freed during kill_pid_info_as_uid
Sonny Rao (1):
powerpc/pci: Check devices status property when scanning OF tree
Sridhar Samudrala (1):
net: Fix IPv6 GSO type checks in Intel ethernet drivers
Stanislaw Gruszka (1):
rt2x00: do not drop usb dev reference counter on suspend
Stratos Psomadakis (1):
Fix broken backport for IPv6 tunnels
Sudhakar Rajashekhara (1):
ARM: davinci: da850 EVM: read mac address from SPI flash
Takashi Iwai (1):
ALSA: hda/realtek - Avoid bogus HP-pin assignment
Theodore Ts'o (1):
ext2,ext3,ext4: don't inherit APPEND_FL or IMMUTABLE_FL for new inodes
Trond Myklebust (1):
NLM: Don't hang forever on NLM unlock requests
Vasily Averin (1):
aacraid: reset should disable MSI interrupt
Venkateswararao Jujjuri (JV) (1):
net/9p: Fix the msize calculation.
Wang Zhi (1):
USB: EHCI: Do not rely on PORT_SUSPEND to stop USB resuming in ehci_bus_resume().
Yang Li (1):
powerpc/mpic: Fix problem that affinity is not updated
Zheng Liu (1):
ext4: fix BUG_ON() in ext4_ext_insert_extent()
hank (1):
time: Change jiffies_to_clock_t() argument type to unsigned long
Documentation/stable_kernel_rules.txt +2 -2
@@ -25,13 +25,13 @@ Rules on what kind of patches are accepted, and which ones are not, into the Procedure for submitting patches to the -stable tree: - Send the patch, after verifying that it follows the above rules, to - [email protected]. + [email protected]. - The sender will receive an ACK when the patch has been accepted into the queue, or a NAK if the patch is rejected. This response might take a few days, according to the developer's schedules. - If accepted, the patch will be added to the -stable queue, for review by other developers and by the relevant subsystem maintainer. - - If the [email protected] address is added to a patch, when it goes into + - If the [email protected] address is added to a patch, when it goes into Linus's tree it will automatically be emailed to the stable team. - Security patches should not be sent to this alias, but instead to the documented [email protected] address.
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 32 -EXTRAVERSION = .46 +EXTRAVERSION = .47 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION*
arch/arm/mach-davinci/board-da850-evm.c +28 -0
@@ -42,6 +42,32 @@#define DA850_MMCSD_CD_PIN GPIO_TO_PIN(4, 0)#define DA850_MMCSD_WP_PIN GPIO_TO_PIN(4, 1) +#ifdef CONFIG_MTD +static void da850_evm_m25p80_notify_add (struct mtd_info *mtd) +{ +char *mac_addr = davinci_soc_info.emac_pdata->mac_addr; +size_t retlen; + +if (!strcmp (mtd->name,"MAC-Address" )) { + mtd->read (mtd,0 ,ETH_ALEN , &retlen, mac_addr); +if (retlen ==ETH_ALEN ) +pr_info ("Read MAC addr from SPI Flash: %pM\n" , + mac_addr); + } +} + +static struct mtd_notifier da850evm_spi_notifier = { + .add = da850_evm_m25p80_notify_add, +}; + +static void da850_evm_setup_mac_addr (void ) +{ +register_mtd_user (&da850evm_spi_notifier); +} +#else +static void da850_evm_setup_mac_addr (void ) { } +#endif +static struct mtd_partition da850_evm_norflash_partition[] = { { .name ="NOR filesystem" ,
@@ -381,6 +407,8 @@ static __init void da850_evm_init(void)if (ret)pr_warning ("da850_evm_init: lcdc registration failed: %d\n" , ret); + +da850_evm_setup_mac_addr (); }#ifdef CONFIG_SERIAL_8250_CONSOLE
arch/arm/plat-mxc/include/mach/iomux-v3.h +5 -5
@@ -73,11 +73,11 @@ struct pad_desc {#define PAD_CTL_HYS (1 << 8)#define PAD_CTL_PKE (1 << 7) -#define PAD_CTL_PUE (1 << 6) -#define PAD_CTL_PUS_100K_DOWN (0 << 4) -#define PAD_CTL_PUS_47K_UP (1 << 4) -#define PAD_CTL_PUS_100K_UP (2 << 4) -#define PAD_CTL_PUS_22K_UP (3 << 4) +#define PAD_CTL_PUE (1 << 6 | PAD_CTL_PKE) +#define PAD_CTL_PUS_100K_DOWN (0 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_47K_UP (1 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_100K_UP (2 << 4 | PAD_CTL_PUE) +#define PAD_CTL_PUS_22K_UP (3 << 4 | PAD_CTL_PUE)#define PAD_CTL_ODE (1 << 3)
arch/mips/alchemy/mtx-1/platform.c +0 -9
@@ -28,8 +28,6 @@#include <linux/mtd/physmap.h> #include <mtd/mtd-abi.h> -#include <asm/mach-au1x00/au1xxx_eth.h> -static struct gpio_keys_button mtx1_gpio_button[] = { { .gpio =207 ,
@@ -142,17 +140,10 @@ static struct __initdata platform_device * mtx1_devs[] = { &mtx1_mtd, }; -static struct au1000_eth_platform_data mtx1_au1000_eth0_pdata = { - .phy_search_highest_addr =1 , - .phy1_search_mac0 =1 , -}; -static int __init mtx1_register_devices (void ) {int rc; -au1xxx_override_eth_cfg (0 , &mtx1_au1000_eth0_pdata); - rc =gpio_request (mtx1_gpio_button[0 ].gpio, mtx1_gpio_button[0 ].desc);if (rc <0 ) {
arch/powerpc/kernel/pci_of_scan.c +2 -0
@@ -300,6 +300,8 @@ static void __devinit __of_scan_bus(struct device_node *node,/* Scan direct children */ for_each_child_of_node (node, child) {pr_debug (" * %s\n" , child->full_name); +if (!of_device_is_available (child)) +continue ; reg =of_get_property (child,"reg" , ®len);if (reg ==NULL || reglen <20 )continue ;
arch/powerpc/sysdev/mpic.c +5 -12
@@ -567,12 +567,10 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)#endif /* CONFIG_MPIC_U3_HT_IRQS */ #ifdef CONFIG_SMP -static int irq_choose_cpu (unsigned int virt_irq) +static int irq_choose_cpu (const cpumask_t *mask) { -cpumask_t mask;int cpuid; -cpumask_copy (&mask, irq_desc[virt_irq].affinity);if (cpus_equal (mask,CPU_MASK_ALL )) {static int irq_rover;static DEFINE_SPINLOCK (irq_rover_lock);
@@ -594,20 +592,15 @@ static int irq_choose_cpu(unsigned int virt_irq) spin_unlock_irqrestore(&irq_rover_lock, flags); }else { -cpumask_t tmp; - -cpus_and (tmp, cpu_online_map, mask); - -if (cpus_empty (tmp)) + cpuid =cpumask_first_and (mask, cpu_online_mask); +if (cpuid >= nr_cpu_ids) goto do_round_robin; - - cpuid =first_cpu (tmp); }return get_hard_smp_processor_id (cpuid); }#else -static int irq_choose_cpu (unsigned int virt_irq) +static int irq_choose_cpu (const cpumask_t *mask) {return hard_smp_processor_id (); }
@@ -816,7 +809,7 @@ int mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask)unsigned int src =mpic_irq_to_hw (irq);if (mpic->flags &MPIC_SINGLE_DEST_CPU ) { -int cpuid =irq_choose_cpu (irq); +int cpuid =irq_choose_cpu (cpumask);mpic_irq_write (src,MPIC_INFO (IRQ_DESTINATION ),1 << cpuid); }else {
arch/s390/kvm/kvm-s390.c +10 -4
@@ -308,11 +308,17 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)struct kvm_vcpu *kvm_arch_vcpu_create (struct kvm *kvm,unsigned int id) { -struct kvm_vcpu *vcpu =kzalloc (sizeof (struct kvm_vcpu ),GFP_KERNEL ); -int rc = -ENOMEM ; +struct kvm_vcpu *vcpu; +int rc = -EINVAL ; + +if (id >=KVM_MAX_VCPUS ) + goto out; + + rc = -ENOMEM ; + vcpu =kzalloc (sizeof (struct kvm_vcpu ),GFP_KERNEL );if (!vcpu) - goto out_nomem; + goto out; vcpu->arch.sie_block = (struct kvm_s390_sie_block *)get_zeroed_page (GFP_KERNEL );
@@ -347,7 +353,7 @@ out_free_sie_block:free_page ((unsigned long )(vcpu->arch.sie_block)); out_free_cpu:kfree (vcpu); -out_nomem: +out:return ERR_PTR (rc); }
arch/sparc/include/asm/sigcontext.h +14 -0
@@ -45,6 +45,19 @@ typedef struct {int si_mask; } __siginfo32_t; +#define __SIGC_MAXWIN 7 + +typedef struct { +unsigned long locals[8 ]; +unsigned long ins[8 ]; +}__siginfo_reg_window ; + +typedef struct { +int wsaved; +__siginfo_reg_window reg_window[__SIGC_MAXWIN]; +unsigned long rwbuf_stkptrs[__SIGC_MAXWIN]; +}__siginfo_rwin_t ; + #ifdef CONFIG_SPARC64 typedef struct { unsigned int si_float_regs [64];
@@ -73,6 +86,7 @@ struct sigcontext { unsigned long ss_size; } sigc_stack;unsigned long sigc_mask; +__siginfo_rwin_t * sigc_rwin_save; };#else
arch/sparc/kernel/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_SPARC32) += sun4m_irq.o sun4c_irq.o sun4d_irq.o obj-y += process_$(BITS).o obj-y += signal_$(BITS).o +obj-y += sigutil_$(BITS).o obj-$(CONFIG_SPARC32) += ioport.o obj-y += setup_$(BITS).o obj-y += idprom.o
arch/sparc/kernel/pcic.c +2 -2
@@ -350,8 +350,8 @@ int __init pcic_probe(void)strcpy (pbm->prom_name, namebuf); { -extern volatile int t_nmi[1 ]; -extern int pcic_nmi_trap_patch[1 ]; +extern volatile int t_nmi[4 ]; +extern int pcic_nmi_trap_patch[4 ]; t_nmi[0 ] = pcic_nmi_trap_patch[0 ]; t_nmi[1 ] = pcic_nmi_trap_patch[1 ];
arch/sparc/kernel/signal32.c +105 -79
328 lines not on this page · raw message
arch/sparc/kernel/signal_32.c +79 -93
291 lines not on this page · raw message
arch/sparc/kernel/signal_64.c +47 -61
185 lines not on this page · raw message
arch/sparc/kernel/sigutil.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef _SIGUTIL_H +#define _SIGUTIL_H + +int save_fpu_state (struct pt_regs *regs,__siginfo_fpu_t __user *fpu); +int restore_fpu_state (struct pt_regs *regs,__siginfo_fpu_t __user *fpu); +int save_rwin_state (int wsaved,__siginfo_rwin_t __user *rwin); +int restore_rwin_state (__siginfo_rwin_t __user *rp); + +#endif /* _SIGUTIL_H */
arch/sparc/kernel/sigutil_32.c new file +120 -0
120 lines not on this page · raw message
arch/sparc/kernel/sigutil_64.c new file +93 -0
93 lines not on this page · raw message
arch/um/drivers/ubd_kern.c +30 -1
@@ -510,8 +510,37 @@ __uml_exitcall(kill_io_thread);static inline int ubd_file_size (struct ubd *ubd_dev,__u64 *size_out) {char *file; +int fd; +int err; + +__u32 version; +__u32 align; +char *backing_file; +time_t mtime; +unsigned long long size; +int sector_size; +int bitmap_offset; + +if (ubd_dev->file && ubd_dev->cow.file) { + file = ubd_dev->cow.file; + + goto out; + } - file = ubd_dev->cow.file ? ubd_dev->cow.file : ubd_dev->file; + fd =os_open_file (ubd_dev->file, global_openflags,0 ); +if (fd <0 ) +return fd; + + err =read_cow_header (file_reader, &fd, &version, &backing_file, \ + &mtime, &size, §or_size, &align, &bitmap_offset); +os_close_file (fd); + +if (err == -EINVAL ) + file = ubd_dev->file; +else + file = backing_file; + +out:return os_file_size (file, size_out); }
arch/x86/include/asm/processor.h +23 -0
@@ -765,6 +765,29 @@ extern unsigned long boot_option_idle_override;extern unsigned long idle_halt;extern unsigned long idle_nomwait; +/* +* on systems with caches, caches must be flashed as the absolute +* last instruction before going into a suspended halt. Otherwise, +* dirty data can linger in the cache and become stale on resume, +* leading to strange errors. +* +* perform a variety of operations to guarantee that the compiler +* will not reorder instructions. wbinvd itself is serializing +* so the processor will not reorder. +* +* Systems without cache can just go into halt. +*/ +static inline void wbinvd_halt (void ) +{ +mb (); +/* check for clflush to determine if wbinvd is legal */ +if (cpu_has_clflush) + asmvolatile ("cli; wbinvd; 1: hlt; jmp 1b" : : :"memory" ); +else +while (1 ) +halt (); +} +extern void enable_sep_cpu (void );extern int sysenter_setup (void );
arch/x86/kernel/amd_iommu.c +1 -1
@@ -842,7 +842,7 @@ static int alloc_new_range(struct amd_iommu *iommu,if (!pte || !IOMMU_PTE_PRESENT (*pte))continue ; -dma_ops_reserve_addresses (dma_dom, i <<PAGE_SHIFT ,1 ); +dma_ops_reserve_addresses (dma_dom, i >>PAGE_SHIFT ,1 ); }update_domain (&dma_dom->domain);
arch/x86/kernel/kprobes.c +3 -1
@@ -83,8 +83,10 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);/* * Undefined/reserved opcodes, conditional jump, Opcode Extension * Groups, and some special opcodes can not boost. +* This is non-const to keep gcc from statically optimizing it out, as +* variable_test_bit makes gcc think only *(unsigned long*) is used. */ -static const u32 twobyte_is_boostable[256 /32 ] = { +static u32 twobyte_is_boostable[256 /32 ] = {/* 0 1 2 3 4 5 6 7 8 9 a b c d e f */ /* ---------------------------------------------- */ W(0x00, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0) | /* 00 */
arch/x86/kernel/smpboot.c +1 -84
95 lines not on this page · raw message
arch/x86/kvm/svm.c +1 -0
@@ -2256,6 +2256,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data) } svm->vmcb->control.tsc_offset = tsc_offset + g_tsc_offset; + vcpu->arch.hv_clock.tsc_timestamp =0 ;break ; }
arch/x86/kvm/vmx.c +1 -0
@@ -1067,6 +1067,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)case MSR_IA32_TSC :rdtscll (host_tsc);guest_write_tsc (data, host_tsc); + vcpu->arch.hv_clock.tsc_timestamp =0 ;break ;case MSR_IA32_CR_PAT :if (vmcs_config.vmentry_ctrl &VM_ENTRY_LOAD_IA32_PAT ) {
arch/x86/xen/smp.c +10 -0
@@ -30,6 +30,7 @@#include <xen/page.h> #include <xen/events.h> +#include <xen/hvc-console.h> #include "xen-ops.h" #include "mmu.h"
@@ -179,6 +180,15 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus) {unsigned cpu; +if (skip_ioapic_setup) { +char *m = (max_cpus ==0 ) ? +"The nosmp parameter is incompatible with Xen; " \ +"use Xen dom0_max_vcpus=1 parameter" : +"The noapic parameter is incompatible with Xen" ; + +xen_raw_printk (m); +panic (m); + }xen_init_lock_cpu (0 );smp_store_cpu_info (0 );
arch/x86/xen/time.c +3 -1
@@ -395,7 +395,9 @@ void xen_setup_timer(int cpu) name ="<timer kasprintf failed>" ; irq =bind_virq_to_irqhandler (VIRQ_TIMER , cpu, xen_timer_interrupt, -IRQF_DISABLED |IRQF_PERCPU |IRQF_NOBALANCING |IRQF_TIMER , +IRQF_DISABLED |IRQF_PERCPU | +IRQF_NOBALANCING |IRQF_TIMER | +IRQF_FORCE_RESUME , name,NULL ); evt = &per_cpu (xen_clock_events, cpu);
arch/x86/xen/xen-asm_32.S +5 -3
@@ -113,11 +113,13 @@ xen_iret_start_crit: /* * If there's something pending, mask events again so we can - * jump back into xen_hypervisor_callback + * jump back into xen_hypervisor_callback. Otherwise do not + * touch XEN_vcpu_info_mask. */ - sete XEN_vcpu_info_mask(%eax) + jne 1f + movb $1, XEN_vcpu_info_mask(%eax) - popl %eax +1: popl %eax /* * From this point on the registers are restored and the stack
block/cfq-iosched.c +204 -60
431 lines not on this page · raw message
drivers/ata/ahci.c +12 -0
@@ -2769,6 +2769,18 @@ static bool ahci_sb600_enable_64bit(struct pci_dev *pdev) DMI_MATCH(DMI_BOARD_NAME, "MS-7376"), }, }, +/* +* All BIOS versions for the Asus M3A support 64bit DMA. +* (all release versions from 0301 to 1206 were tested) +*/ + { + .ident = "ASUS M3A", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, + "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "M3A"), + }, + }, { } }; const struct dmi_system_id *match;
drivers/base/sys.c +6 -0
@@ -471,6 +471,12 @@ int sysdev_resume(void) {struct sysdev_class *cls; +/* +* Called from syscore in mainline but called directly here +* since syscore does not exist in this tree. +*/ +irq_pm_syscore_resume (); +WARN_ONCE (!irqs_disabled (),"Interrupts enabled while resuming system devices\n" );
drivers/block/xen-blkfront.c +1 -1
@@ -889,7 +889,7 @@ static void blkfront_connect(struct blkfront_info *info) } err =xenbus_gather (XBT_NIL , info->xbdev->otherend, -"feature-barrier" ,"%lu" , &info->feature_barrier, +"feature-barrier" ,"%d" , &info->feature_barrier,NULL );if (err) info->feature_barrier =0 ;
drivers/char/hvc_console.c +5 -3
@@ -162,8 +162,10 @@ static void hvc_console_print(struct console *co, const char *b, }else { r = cons_ops[index]->put_chars (vtermnos[index], c, i);if (r <=0 ) { -/* throw away chars on error */ - i =0 ; +/* throw away characters on error +* but spin in case of -EAGAIN */ +if (r != -EAGAIN ) + i =0 ; }else if (r >0 ) { i -= r;if (i >0 )
@@ -447,7 +449,7 @@ static int hvc_push(struct hvc_struct *hp) n = hp->ops->put_chars (hp->vtermno, hp->outbuf, hp->n_outbuf);if (n <=0 ) { -if (n ==0 ) { +if (n ==0 || n == -EAGAIN ) { hp->do_wakeup =1 ;return 0 ; }
drivers/char/tpm/tpm.c +8 -1
@@ -374,6 +374,9 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,u32 count, ordinal;unsigned long stop; +if (bufsiz >TPM_BUFSIZE ) + bufsiz =TPM_BUFSIZE ; + count =be32_to_cpu (*((__be32 *) (buf +2 ))); ordinal =be32_to_cpu (*((__be32 *) (buf +6 )));if (count ==0 )
@@ -1041,6 +1044,7 @@ ssize_t tpm_read(struct file *file, char __user *buf, {struct tpm_chip *chip = file->private_data;ssize_t ret_size; +int rc;del_singleshot_timer_sync (&chip->user_read_timer);flush_scheduled_work ();
@@ -1051,8 +1055,11 @@ ssize_t tpm_read(struct file *file, char __user *buf, ret_size = size;mutex_lock (&chip->buffer_mutex); -if (copy_to_user (buf, chip->data_buffer, ret_size)) + rc =copy_to_user (buf, chip->data_buffer, ret_size); +memset (chip->data_buffer,0 , ret_size); +if (rc) ret_size = -EFAULT ; +mutex_unlock (&chip->buffer_mutex); }
drivers/hid/hid-ids.h +3 -0
@@ -389,6 +389,9 @@#define USB_VENDOR_ID_SAMSUNG 0x0419#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001 +#define USB_VENDOR_ID_SIGMA_MICRO 0x1c4f +#define USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD 0x0002 +#define USB_VENDOR_ID_SONY 0x054c#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268
drivers/hid/usbhid/hid-quirks.c +1 -0
@@ -65,6 +65,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS }, { 0, 0 } };
drivers/hwmon/w83627ehf.c +11 -4
@@ -1239,7 +1239,8 @@ static void w83627ehf_device_remove_files(struct device *dev) }/* Get the monitoring functions started */ -static inline void __devinit w83627ehf_init_device (struct w83627ehf_data *data) +static inline void __devinit w83627ehf_init_device (struct w83627ehf_data *data, +enum kinds kind) {int i;u8 tmp, diode;
@@ -1268,10 +1269,16 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)w83627ehf_write_value (data,W83627EHF_REG_VBAT , tmp |0x01 );/* Get thermal sensor types */ - diode =w83627ehf_read_value (data,W83627EHF_REG_DIODE ); +switch (kind) { +case w83627ehf: + diode =w83627ehf_read_value (data,W83627EHF_REG_DIODE ); +break ; +default : + diode =0x70 ; + }for (i =0 ; i <3 ; i++) {if ((tmp & (0x02 << i))) - data->temp_type[i] = (diode & (0x10 << i)) ?1 :2 ; + data->temp_type[i] = (diode & (0x10 << i)) ?1 :3 ;else data->temp_type[i] =4 ;/* thermistor */ }
@@ -1319,7 +1326,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) }/* Initialize the chip */ -w83627ehf_init_device (data); +w83627ehf_init_device (data, sio_data->kind); data->vrm =vid_which_vrm ();superio_enter (sio_data->sioreg);
drivers/md/linear.h +1 -1
@@ -10,9 +10,9 @@ typedef struct dev_info dev_info_t;struct linear_private_data { +struct rcu_head rcu;sector_t array_sectors;dev_info_t disks[0 ]; -struct rcu_head rcu; };
drivers/md/md.c +10 -2
@@ -848,8 +848,11 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version ret =0 ; } rdev->sectors = rdev->sb_start; +/* Limit to 4TB as metadata cannot record more than that */ +if (rdev->sectors >= (2ULL <<32 )) + rdev->sectors = (2ULL <<32 ) -2 ; -if (rdev->sectors < sb->size *2 && sb->level >1 ) +if (rdev->sectors < ((sector_t )sb->size) *2 && sb->level >=1 )/* "this cannot possibly happen" ... */ ret = -EINVAL ;
@@ -884,7 +887,7 @@ static int super_90_validate(mddev_t *mddev, mdk_rdev_t *rdev) mddev->clevel[0 ] =0 ; mddev->layout = sb->layout; mddev->raid_disks = sb->raid_disks; - mddev->dev_sectors = sb->size *2 ; + mddev->dev_sectors = ((sector_t )sb->size) *2 ; mddev->events = ev1; mddev->bitmap_offset =0 ; mddev->default_bitmap_offset =MD_SB_BYTES >>9 ;
@@ -1122,6 +1125,11 @@ super_90_rdev_size_change(mdk_rdev_t *rdev, sector_t num_sectors) rdev->sb_start =calc_dev_sboffset (rdev->bdev);if (!num_sectors || num_sectors > rdev->sb_start) num_sectors = rdev->sb_start; +/* Limit to 4TB as metadata cannot record more than that. +* 4TB == 2^32 KB, or 2*2^32 sectors. +*/ +if (num_sectors >= (2ULL <<32 )) + num_sectors = (2ULL <<32 ) -2 ;md_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev);
drivers/media/video/cx23885/cx23885-dvb.c +1 -1
@@ -693,7 +693,7 @@ static int dvb_register(struct cx23885_tsport *port)static struct xc2028_ctrl ctl = { .fname =XC3028L_DEFAULT_FIRMWARE , .max_len =64 , - .demod =5000 , + .demod =XC3028_FE_DIBCOM52 ,/* This is true for all demods with v36 firmware? */ .type =XC2028_D2633 ,
drivers/media/video/uvc/uvc_driver.c +1 -1
@@ -1889,7 +1889,7 @@ static int __uvc_resume(struct usb_interface *intf, int reset)list_for_each_entry (stream, &dev->streams, list) {if (stream->intf == intf) -return uvc_video_resume (stream); +return uvc_video_resume (stream, reset); } uvc_trace(UVC_TRACE_SUSPEND, "Resume: video streaming USB interface "
drivers/media/video/uvc/uvc_video.c +9 -1
@@ -1024,10 +1024,18 @@ int uvc_video_suspend(struct uvc_streaming *stream)* buffers, making sure userspace applications are notified of the problem * instead of waiting forever. */ -int uvc_video_resume (struct uvc_streaming *stream) +int uvc_video_resume (struct uvc_streaming *stream,int reset) {int ret; +/* If the bus has been reset on resume, set the alternate setting to 0. +* This should be the default value, but some devices crash or otherwise +* misbehave if they don't receive a SET_INTERFACE request before any +* other video control request. +*/ +if (reset) +usb_set_interface (stream->dev->udev, stream->intfnum,0 ); + stream->frozen =0 ; ret =uvc_commit_video (stream, &stream->ctrl);
drivers/media/video/uvc/uvcvideo.h +1 -1
@@ -608,7 +608,7 @@ extern const struct v4l2_file_operations uvc_fops;/* Video */ extern int uvc_video_init (struct uvc_streaming *stream);extern int uvc_video_suspend (struct uvc_streaming *stream); -extern int uvc_video_resume (struct uvc_streaming *stream); +extern int uvc_video_resume (struct uvc_streaming *stream,int reset);extern int uvc_video_enable (struct uvc_streaming *stream,int enable);extern int uvc_probe_video (struct uvc_streaming *stream,struct uvc_streaming_control *probe);
drivers/net/cnic.c +2 -2
@@ -2718,7 +2718,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event, dev =cnic_from_netdev (netdev); -if (!dev && (event ==NETDEV_REGISTER || event ==NETDEV_UP )) { +if (!dev && (event ==NETDEV_REGISTER ||netif_running (netdev))) {/* Check for the hot-plug device */ dev =is_cnic_dev (netdev);if (dev) {
@@ -2734,7 +2734,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,else if (event ==NETDEV_UNREGISTER )cnic_ulp_exit (dev); -if (event ==NETDEV_UP ) { +if (event ==NETDEV_UP || (new_dev &&netif_running (netdev))) {if (cnic_register_netdev (dev) !=0 ) {cnic_put (dev); goto done;
drivers/net/e1000/e1000_hw.c +6 -0
@@ -3842,6 +3842,12 @@ s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw) checksum += eeprom_data; } +#ifdef CONFIG_PARISC +/* This is a signature and not a checksum on HP c8000 */ +if ((hw->subsystem_vendor_id ==0x103C ) && (eeprom_data ==0x16d6 )) +return E1000_SUCCESS ; + +#endif if (checksum == (u16 )EEPROM_SUM )return E1000_SUCCESS ;else {
drivers/net/e1000e/netdev.c +1 -1
@@ -3807,7 +3807,7 @@ static int e1000_tso(struct e1000_adapter *adapter, 0); cmd_length =E1000_TXD_CMD_IP ; ipcse =skb_transport_offset (skb) -1 ; - }else if (skb_shinfo (skb)->gso_type ==SKB_GSO_TCPV6 ) { + }else if (skb_is_gso_v6 (skb)) {ipv6_hdr (skb)->payload_len =0 ;tcp_hdr (skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
drivers/net/igb/igb_main.c +1 -1
@@ -3032,7 +3032,7 @@ static inline int igb_tso_adv(struct igb_adapter *adapter, iph->daddr,0 ,IPPROTO_TCP , 0); - }else if (skb_shinfo (skb)->gso_type ==SKB_GSO_TCPV6 ) { + }else if (skb_is_gso_v6 (skb)) {ipv6_hdr (skb)->payload_len =0 ; tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
drivers/net/igbvf/netdev.c +1 -1
@@ -1953,7 +1953,7 @@ static int igbvf_tso(struct igbvf_adapter *adapter, iph->daddr,0 ,IPPROTO_TCP , 0); - }else if (skb_shinfo (skb)->gso_type ==SKB_GSO_TCPV6 ) { + }else if (skb_is_gso_v6 (skb)) {ipv6_hdr (skb)->payload_len =0 ; tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr, &ipv6_hdr(skb)->daddr,
drivers/net/irda/smsc-ircc2.c +1 -1
@@ -515,7 +515,7 @@ static const struct net_device_ops smsc_ircc_netdev_ops = {* Try to open driver instance * */ -static int __init smsc_ircc_open (unsigned int fir_base,unsigned int sir_base,u8 dma,u8 irq) +static int __devinit smsc_ircc_open (unsigned int fir_base,unsigned int sir_base,u8 dma,u8 irq) {struct smsc_ircc_cb *self;struct net_device *dev;
drivers/net/ixgbe/ixgbe_main.c +1 -1
@@ -4881,7 +4881,7 @@ static int ixgbe_tso(struct ixgbe_adapter *adapter,IPPROTO_TCP , 0); adapter->hw_tso_ctxt++; - }else if (skb_shinfo (skb)->gso_type ==SKB_GSO_TCPV6 ) { + }else if (skb_is_gso_v6 (skb)) {ipv6_hdr (skb)->payload_len =0 ;tcp_hdr (skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
drivers/net/rionet.c +2 -2
@@ -87,8 +87,8 @@ static struct rio_dev **rionet_active;#define dev_rionet_capable (dev) \ is_rionet_capable(dev->pef, dev->src_ops, dev->dst_ops) -#define RIONET_MAC_MATCH (x) (*(u32 *)x == 0x00010001) -#define RIONET_GET_DESTID (x) (*(u16 *)(x + 4)) +#define RIONET_MAC_MATCH (x) (!memcmp((x), "\00\01\00\01", 4)) +#define RIONET_GET_DESTID (x) ((*((u8 *)x + 4) << 8) | *((u8 *)x + 5))static int rionet_rx_clean (struct net_device *ndev) {
drivers/net/usb/asix.c +4 -0
@@ -1467,6 +1467,10 @@ static const struct usb_device_id products [] = { USB_DEVICE (0x04f1, 0x3008), .driver_info = (unsigned long ) &ax8817x_info, }, { +// ASIX AX88772B 10/100 +USB_DEVICE (0x0b95 ,0x772b ), + .driver_info = (unsigned long) &ax88772_info, +}, {// ASIX AX88772 10/100 USB_DEVICE (0x0b95 ,0x7720 ), .driver_info = (unsigned long) &ax88772_info,
drivers/net/wireless/b43/main.c +2 -1
@@ -1526,7 +1526,8 @@ static void handle_irq_beacon(struct b43_wldev *dev)u32 cmd, beacon0_valid, beacon1_valid;if (!b43_is_mode (wl,NL80211_IFTYPE_AP ) && - !b43_is_mode (wl,NL80211_IFTYPE_MESH_POINT )) + !b43_is_mode (wl,NL80211_IFTYPE_MESH_POINT ) && + !b43_is_mode (wl,NL80211_IFTYPE_ADHOC ))return ;/* This is the bottom half of the asynchronous beacon update. */
drivers/net/wireless/rt2x00/rt2x00usb.c +1 -13
@@ -703,18 +703,8 @@ int rt2x00usb_suspend(struct usb_interface *usb_intf, pm_message_t state) {struct ieee80211_hw *hw =usb_get_intfdata (usb_intf);struct rt2x00_dev *rt2x00dev = hw->priv; -int retval; - - retval =rt2x00lib_suspend (rt2x00dev, state); -if (retval) -return retval; -/* -* Decrease usbdev refcount. -*/ -usb_put_dev (interface_to_usbdev (usb_intf)); - -return 0 ; +return rt2x00lib_suspend (rt2x00dev, state); }EXPORT_SYMBOL_GPL (rt2x00usb_suspend);
@@ -723,8 +713,6 @@ int rt2x00usb_resume(struct usb_interface *usb_intf)struct ieee80211_hw *hw =usb_get_intfdata (usb_intf);struct rt2x00_dev *rt2x00dev = hw->priv; -usb_get_dev (interface_to_usbdev (usb_intf)); -return rt2x00lib_resume (rt2x00dev); }EXPORT_SYMBOL_GPL (rt2x00usb_resume);
drivers/platform/x86/thinkpad_acpi.c +5 -2
@@ -118,7 +118,9 @@ enum { };/* ACPI HIDs */ -#define TPACPI_ACPI_HKEY_HID "IBM0068" +#define TPACPI_ACPI_IBM_HKEY_HID "IBM0068" +#define TPACPI_ACPI_LENOVO_HKEY_HID "LEN0068" +#define TPACPI_ACPI_EC_HID "PNP0C09"/* Input IDs */ #define TPACPI_HKEY_INPUT_PRODUCT 0x5054/* "TP" */
@@ -3840,7 +3842,8 @@ errexit: }static const struct acpi_device_id ibm_htk_device_ids[] = { - {TPACPI_ACPI_HKEY_HID ,0 }, + {TPACPI_ACPI_IBM_HKEY_HID ,0 }, + {TPACPI_ACPI_LENOVO_HKEY_HID ,0 }, {"" ,0 }, };
drivers/s390/cio/ccwgroup.c +22 -20
95 lines not on this page · raw message
drivers/scsi/3w-9xxx.c +2 -0
@@ -1786,10 +1786,12 @@ static int twa_scsi_queue(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmndswitch (retval) {case SCSI_MLQUEUE_HOST_BUSY :twa_free_request_id (tw_dev, request_id); +twa_unmap_scsi_data (tw_dev, request_id);break ;case 1 : tw_dev->state[request_id] =TW_S_COMPLETED ;twa_free_request_id (tw_dev, request_id); +twa_unmap_scsi_data (tw_dev, request_id); SCpnt->result = (DID_ERROR <<16 );done (SCpnt); retval =0 ;
drivers/scsi/aacraid/commsup.c +2 -0
@@ -1202,6 +1202,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)kfree (aac->queues); aac->queues =NULL ;free_irq (aac->pdev->irq, aac); +if (aac->msi) +pci_disable_msi (aac->pdev);kfree (aac->fsa_dev); aac->fsa_dev =NULL ; quirks =aac_get_driver_ident (index)->quirks;
drivers/scsi/ipr.c +1 -1
@@ -7668,7 +7668,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev, uproc =readl (ioa_cfg->regs.sense_uproc_interrupt_reg);if ((mask &IPR_PCII_HRRQ_UPDATED ) ==0 || (uproc &IPR_UPROCI_RESET_ALERT )) ioa_cfg->needs_hard_reset =1 ; -if (interrupts &IPR_PCII_ERROR_INTERRUPTS ) +if ((interrupts &IPR_PCII_ERROR_INTERRUPTS ) || reset_devices) ioa_cfg->needs_hard_reset =1 ;if (interrupts &IPR_PCII_IOA_UNIT_CHECKED ) ioa_cfg->ioa_unit_checked =1 ;
drivers/scsi/libiscsi_tcp.c +3 -11
@@ -1069,7 +1069,8 @@ iscsi_tcp_conn_setup(struct iscsi_cls_session *cls_session, int dd_data_size,struct iscsi_cls_conn *cls_conn;struct iscsi_tcp_conn *tcp_conn; - cls_conn =iscsi_conn_setup (cls_session,sizeof (*tcp_conn), conn_idx); + cls_conn =iscsi_conn_setup (cls_session, +sizeof (*tcp_conn) + dd_data_size, conn_idx);if (!cls_conn)return NULL ; conn = cls_conn->dd_data;
@@ -1081,22 +1082,13 @@ iscsi_tcp_conn_setup(struct iscsi_cls_session *cls_session, int dd_data_size, tcp_conn = conn->dd_data; tcp_conn->iscsi_conn = conn; - - tcp_conn->dd_data =kzalloc (dd_data_size,GFP_KERNEL ); -if (!tcp_conn->dd_data) { -iscsi_conn_teardown (cls_conn); -return NULL ; - } + tcp_conn->dd_data = conn->dd_data +sizeof (*tcp_conn);return cls_conn; }EXPORT_SYMBOL_GPL (iscsi_tcp_conn_setup);void iscsi_tcp_conn_teardown (struct iscsi_cls_conn *cls_conn) { -struct iscsi_conn *conn = cls_conn->dd_data; -struct iscsi_tcp_conn *tcp_conn = conn->dd_data; - -kfree (tcp_conn->dd_data);iscsi_conn_teardown (cls_conn); }EXPORT_SYMBOL_GPL (iscsi_tcp_conn_teardown);
drivers/scsi/libsas/sas_expander.c +9 -5
@@ -198,6 +198,8 @@ static void sas_set_ex_phy(struct domain_device *dev, int phy_id, phy->virtual = dr->virtual; phy->last_da_index =-1 ; + phy->phy->identify.sas_address =SAS_ADDR (phy->attached_sas_addr); + phy->phy->identify.device_type = phy->attached_dev_type; phy->phy->identify.initiator_port_protocols = phy->attached_iproto; phy->phy->identify.target_port_protocols = phy->attached_tproto; phy->phy->identify.phy_identifier = phy_id;
@@ -1712,7 +1714,7 @@ static int sas_find_bcast_dev(struct domain_device *dev,list_for_each_entry (ch, &ex->children, siblings) {if (ch->dev_type ==EDGE_DEV || ch->dev_type ==FANOUT_DEV ) { res =sas_find_bcast_dev (ch, src_dev); -if (src_dev) +if (*src_dev)return res; } }
@@ -1757,10 +1759,12 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,sas_disable_routing (parent, phy->attached_sas_addr); }memset (phy->attached_sas_addr,0 ,SAS_ADDR_SIZE ); -sas_port_delete_phy (phy->port, phy->phy); -if (phy->port->num_phys ==0 ) -sas_port_delete (phy->port); - phy->port =NULL ; +if (phy->port) { +sas_port_delete_phy (phy->port, phy->phy); +if (phy->port->num_phys ==0 ) +sas_port_delete (phy->port); + phy->port =NULL ; + } } static int sas_discover_bfs_by_root_level(struct domain_device *root,
drivers/scsi/qla2xxx/qla_init.c +0 -3
@@ -3459,15 +3459,12 @@ qla2x00_loop_resync(scsi_qla_host_t *vha) req = vha->req; rsp = req->rsp; -atomic_set (&vha->loop_state,LOOP_UPDATE );clear_bit (ISP_ABORT_RETRY , &vha->dpc_flags);if (vha->flags.online) {if (!(rval =qla2x00_fw_ready (vha))) {/* Wait at most MAX_TARGET RSCNs for a stable link. */ wait_time =256 ; do { - atomic_set(&vha->loop_state, LOOP_UPDATE); - /* Issue a marker after FW becomes ready. */ qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL);
drivers/scsi/qla2xxx/qla_isr.c +0 -1
@@ -717,7 +717,6 @@ skip_rio: vha->flags.rscn_queue_overflow =1 ; } -atomic_set (&vha->loop_state,LOOP_UPDATE );atomic_set (&vha->loop_down_timer,0 ); vha->flags.management_server_logged_in =0 ;
drivers/staging/quatech_usb2/quatech_usb2.c +7 -2
@@ -921,9 +921,10 @@ static int qt2_ioctl(struct tty_struct *tty, struct file *file,dbg ("%s() port %d, cmd == TIOCMIWAIT enter" , __func__, port->number); prev_msr_value = port_extra->shadowMSR &QT2_SERIAL_MSR_MASK ; +barrier (); +__set_current_state (TASK_INTERRUPTIBLE );while (1 ) {add_wait_queue (&port_extra->wait, &wait); -set_current_state (TASK_INTERRUPTIBLE );schedule ();dbg ("%s(): port %d, cmd == TIOCMIWAIT here\n" , __func__, port->number);
@@ -931,9 +932,12 @@ static int qt2_ioctl(struct tty_struct *tty, struct file *file,/* see if a signal woke us up */ if (signal_pending (current))return -ERESTARTSYS ; +set_current_state (TASK_INTERRUPTIBLE ); msr_value = port_extra->shadowMSR &QT2_SERIAL_MSR_MASK ; -if (msr_value == prev_msr_value) +if (msr_value == prev_msr_value) { +__set_current_state (TASK_RUNNING );return -EIO ;/* no change - error */ + } if ((arg & TIOCM_RNG && ((prev_msr_value & QT2_SERIAL_MSR_RI) == (msr_value & QT2_SERIAL_MSR_RI))) ||
@@ -946,6 +950,7 @@ static int qt2_ioctl(struct tty_struct *tty, struct file *file, (arg & TIOCM_CTS && ((prev_msr_value & QT2_SERIAL_MSR_CTS) == (msr_value & QT2_SERIAL_MSR_CTS)))) { +__set_current_state (TASK_RUNNING );return 0 ; } }/* end inifinite while */
drivers/usb/class/cdc-acm.c +3 -0
@@ -1606,6 +1606,9 @@ static struct usb_device_id acm_ids[] = { { NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */ { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */ + /* Support for Owen devices */ + { USB_DEVICE(0x03eb, 0x0030), }, /* Owen SI30 */ +/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ /* control interfaces without any protocol set */
drivers/usb/core/devio.c +4 -2
@@ -403,7 +403,7 @@ static void async_completed(struct urb *urb) sinfo.si_errno = as->status; sinfo.si_code =SI_ASYNCIO ; sinfo.si_addr = as->userurb; - pid = as->pid; + pid =get_pid (as->pid); uid = as->uid; euid = as->euid; secid = as->secid;
@@ -416,9 +416,11 @@ static void async_completed(struct urb *urb)cancel_bulk_urbs (ps, as->bulk_addr);spin_unlock (&ps->lock); -if (signr) +if (signr) {kill_pid_info_as_uid (sinfo.si_signo, &sinfo, pid, uid, euid, secid); +put_pid (pid); + }wake_up (&ps->wait); }
drivers/usb/core/quirks.c +21 -0
@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = {/* Creative SB Audigy 2 NX */ { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Webcam C200 */ + { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, + + /* Logitech Webcam C250 */ + { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + + /* Logitech Webcam B/C500 */ + { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, + + /* Logitech Webcam Pro 9000 */ + { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME }, + + /* Logitech Webcam C310 */ + { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME }, + + /* Logitech Webcam C270 */ + { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Logitech Harmony 700-series */ { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x06a3, 0x0006), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Guillemot Webcam Hercules Dualpix Exchange*/ + { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
drivers/usb/host/ehci-hub.c +3 -4
@@ -243,7 +243,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)u32 temp;u32 power_okay;int i; -u8 resume_needed =0 ; +unsigned long resume_needed =0 ;if (time_before (jiffies, ehci->next_statechange))msleep (5 );
@@ -307,7 +307,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)if (test_bit (i, &ehci->bus_suspended) && (temp &PORT_SUSPEND )) { temp |=PORT_RESUME ; - resume_needed =1 ; +set_bit (i, &resume_needed); }ehci_writel (ehci, temp, &ehci->regs->port_status [i]); }
@@ -322,8 +322,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd) i =HCS_N_PORTS (ehci->hcs_params);while (i--) { temp =ehci_readl (ehci, &ehci->regs->port_status [i]); -if (test_bit (i, &ehci->bus_suspended) && - (temp &PORT_SUSPEND )) { +if (test_bit (i, &resume_needed)) { temp &= ~(PORT_RWC_BITS |PORT_RESUME );ehci_writel (ehci, temp, &ehci->regs->port_status [i]);ehci_vdbg (ehci,"resumed port %d\n" , i +1 );
drivers/usb/host/fhci-sched.c +15 -4
@@ -1,7 +1,7 @@/* * Freescale QUICC Engine USB Host Controller Driver * -* Copyright (c) Freescale Semicondutor, Inc. 2006. +* Copyright (c) Freescale Semicondutor, Inc. 2006, 2011. * Shlomi Gridish <[email protected]> * Jerry Huang <[email protected]> * Copyright (c) Logic Product Development, Inc. 2007
@@ -810,9 +810,11 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb) ed->dev_addr =usb_pipedevice (urb->pipe); ed->max_pkt_size =usb_maxpacket (urb->dev, urb->pipe,usb_pipeout (urb->pipe)); +/* setup stage */ td =fhci_td_fill (fhci, urb, urb_priv, ed, cnt++,FHCI_TA_SETUP ,USB_TD_TOGGLE_DATA0 , urb->setup_packet,8 ,0 ,0 , true); +/* data stage */ if (data_len >0 ) { td = fhci_td_fill(fhci, urb, urb_priv, ed, cnt++, usb_pipeout(urb->pipe) ? FHCI_TA_OUT :
@@ -820,9 +822,18 @@ void fhci_queue_urb(struct fhci_hcd *fhci, struct urb *urb)USB_TD_TOGGLE_DATA1 , data, data_len,0 ,0 , true); } - td =fhci_td_fill (fhci, urb, urb_priv, ed, cnt++, -usb_pipeout (urb->pipe) ?FHCI_TA_IN :FHCI_TA_OUT , -USB_TD_TOGGLE_DATA1 , data,0 ,0 ,0 , true); + +/* status stage */ +if (data_len >0 ) + td =fhci_td_fill (fhci, urb, urb_priv, ed, cnt++, + (usb_pipeout (urb->pipe) ?FHCI_TA_IN : +FHCI_TA_OUT ), +USB_TD_TOGGLE_DATA1 , data,0 ,0 ,0 , true); +else + td =fhci_td_fill (fhci, urb, urb_priv, ed, cnt++, +FHCI_TA_IN , +USB_TD_TOGGLE_DATA1 , data,0 ,0 ,0 , true); + urb_state =US_CTRL_SETUP ;break ;case FHCI_TF_ISO :
drivers/usb/host/xhci-mem.c +12 -10
@@ -110,18 +110,20 @@ void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring)struct xhci_segment *seg;struct xhci_segment *first_seg; -if (!ring || !ring->first_seg) +if (!ring)return ; - first_seg = ring->first_seg; - seg = first_seg->next; -xhci_dbg (xhci,"Freeing ring at %p\n" , ring); -while (seg != first_seg) { -struct xhci_segment *next = seg->next; -xhci_segment_free (xhci, seg); - seg = next; +if (ring->first_seg) { + first_seg = ring->first_seg; + seg = first_seg->next; +xhci_dbg (xhci,"Freeing ring at %p\n" , ring); +while (seg != first_seg) { +struct xhci_segment *next = seg->next; +xhci_segment_free (xhci, seg); + seg = next; + } +xhci_segment_free (xhci, first_seg); + ring->first_seg =NULL ; } -xhci_segment_free (xhci, first_seg); - ring->first_seg =NULL ;kfree (ring); }
drivers/usb/mon/mon_bin.c +1 -1
@@ -1041,7 +1041,7 @@ static int mon_bin_ioctl(struct inode *inode, struct file *file, nevents =mon_bin_queued (rp); sp = (struct mon_bin_stats __user *)arg; -if (put_user (rp->cnt_lost, &sp->dropped)) +if (put_user (ndropped, &sp->dropped))return -EFAULT ;if (put_user (nevents, &sp->queued))return -EFAULT ;
drivers/usb/musb/musb_core.c +0 -1
@@ -1634,7 +1634,6 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit) } } } -musb_writeb (musb_base,MUSB_INDEX , musb->context.index); }#else
drivers/usb/serial/ftdi_sio.c +24 -1
@@ -105,6 +105,7 @@ static int ftdi_jtag_probe(struct usb_serial *serial);static int ftdi_mtxorb_hack_setup (struct usb_serial *serial);static int ftdi_NDI_device_setup (struct usb_serial *serial);static int ftdi_stmclite_probe (struct usb_serial *serial); +static int ftdi_8u2232c_probe (struct usb_serial *serial);static void ftdi_USB_UIRT_setup (struct ftdi_private *priv);static void ftdi_HE_TIRA1_setup (struct ftdi_private *priv);
@@ -132,6 +133,10 @@ static struct ftdi_sio_quirk ftdi_stmclite_quirk = { .probe = ftdi_stmclite_probe, }; +static struct ftdi_sio_quirk ftdi_8u2232c_quirk = { + .probe = ftdi_8u2232c_probe, +}; +/* * The 8U232AM has the same API as the sio except for: * - it can support MUCH higher baudrates; up to:
@@ -155,6 +160,7 @@ static struct ftdi_sio_quirk ftdi_stmclite_quirk = {* /sys/bus/usb/ftdi_sio/new_id, then send patch/report! */ static struct usb_device_id id_table_combined [] = { + {USB_DEVICE (FTDI_VID ,FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID ) }, {USB_DEVICE (FTDI_VID ,FTDI_CTI_MINI_PID ) }, {USB_DEVICE (FTDI_VID ,FTDI_CTI_NANO_PID ) }, {USB_DEVICE (FTDI_VID ,FTDI_AMC232_PID ) },
@@ -181,7 +187,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_8U232AM_ALT_PID) }, { USB_DEVICE(FTDI_VID, FTDI_232RL_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_8U2232C_PID) , + .driver_info = (kernel_ulong_t)&ftdi_8u2232c_quirk }, { USB_DEVICE(FTDI_VID, FTDI_4232H_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MICRO_CHAMELEON_PID) }, { USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },
@@ -203,6 +210,8 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, FTDI_XF_640_PID) }, { USB_DEVICE(FTDI_VID, FTDI_XF_642_PID) }, { USB_DEVICE(FTDI_VID, FTDI_DSS20_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_URBAN_0_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_URBAN_1_PID) }, { USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) }, { USB_DEVICE(FTDI_VID, FTDI_VNHCPCUSB_D_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MTXORB_0_PID) },
@@ -740,6 +749,8 @@ static struct usb_device_id id_table_combined [] = { .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, LMI_LM3S_EVAL_BOARD_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, LMI_LM3S_ICDI_BOARD_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(FTDI_VID, FTDI_TURTELIZER_PID), .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
@@ -1762,6 +1773,18 @@ static int ftdi_jtag_probe(struct usb_serial *serial)return 0 ; } +static int ftdi_8u2232c_probe (struct usb_serial *serial) +{ +struct usb_device *udev = serial->dev; + +dbg ("%s" , __func__); + +if (strcmp (udev->manufacturer,"CALAO Systems" ) ==0 ) +return ftdi_jtag_probe (serial); + +return 0 ; +} +/* * First and second port on STMCLiteadaptors is reserved for JTAG interface * and the forth port for pio
drivers/usb/serial/ftdi_sio_ids.h +10 -3
@@ -53,6 +53,7 @@/* FTDI 2332C Dual channel device, side A=245 FIFO (JTAG), Side B=RS232 UART */ #define LMI_LM3S_DEVEL_BOARD_PID 0xbcd8#define LMI_LM3S_EVAL_BOARD_PID 0xbcd9 +#define LMI_LM3S_ICDI_BOARD_PID 0xbcda#define FTDI_TURTELIZER_PID 0xBDC8/* JTAG/RS-232 adapter by egnite GmBH */
@@ -419,9 +420,11 @@#define PROTEGO_SPECIAL_4 0xFC73/* special/unknown device */ /* -* DSS-20 Sync Station for Sony Ericsson P800 +* Sony Ericsson product ids */ -#define FTDI_DSS20_PID 0xFC82 +#define FTDI_DSS20_PID 0xFC82/* DSS-20 Sync Station for Sony Ericsson P800 */ +#define FTDI_URBAN_0_PID 0xFC8A/* Sony Ericsson Urban, uart #0 */ +#define FTDI_URBAN_1_PID 0xFC8B/* Sony Ericsson Urban, uart #1 */ /* www.irtrans.de device */ #define FTDI_IRTRANS_PID 0xFC60/* Product Id */
@@ -1164,4 +1167,8 @@/* USB-Nano-485*/ #define FTDI_CTI_NANO_PID 0xF60B - +/* +* ZeitControl cardsystems GmbH rfid-readers http://zeitconrol.de +*/ +/* TagTracer MIFARE*/ +#define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0
drivers/usb/serial/pl2303.c +23 -4
@@ -102,6 +102,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) }, { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) }, { USB_DEVICE(WINCHIPHEAD_VENDOR_ID, WINCHIPHEAD_USBSER_PRODUCT_ID) }, + { USB_DEVICE(SMART_VENDOR_ID, SMART_PRODUCT_ID) }, { } /* Terminating entry */ };
@@ -617,10 +618,28 @@ static void pl2303_set_termios(struct tty_struct *tty, baud =6000000 ; }dbg ("%s - baud set = %d" , __func__, baud); - buf[0 ] = baud &0xff ; - buf[1 ] = (baud >>8 ) &0xff ; - buf[2 ] = (baud >>16 ) &0xff ; - buf[3 ] = (baud >>24 ) &0xff ; +if (baud <=115200 ) { + buf[0 ] = baud &0xff ; + buf[1 ] = (baud >>8 ) &0xff ; + buf[2 ] = (baud >>16 ) &0xff ; + buf[3 ] = (baud >>24 ) &0xff ; + }else { +/* apparently the formula for higher speeds is: +* baudrate = 12M * 32 / (2^buf[1]) / buf[0] +*/ +unsigned tmp =12 *1000 *1000 *32 / baud; + buf[3 ] =0x80 ; + buf[2 ] =0 ; + buf[1 ] = (tmp >=256 ); +while (tmp >=256 ) { + tmp >>=2 ; + buf[1 ] <<=1 ; + } +if (tmp >256 ) { + tmp %=256 ; + } + buf[0 ] = tmp; + } }/* For reference buf[4]=0 is 1 stop bits */
drivers/usb/serial/pl2303.h +5 -0
@@ -148,3 +148,8 @@/* WinChipHead USB->RS 232 adapter */ #define WINCHIPHEAD_VENDOR_ID 0x4348#define WINCHIPHEAD_USBSER_PRODUCT_ID 0x5523 + +/* SMART USB Serial Adapter */ +#define SMART_VENDOR_ID 0x0b8c +#define SMART_PRODUCT_ID 0x2303 +
drivers/usb/serial/qcserial.c +2 -0
@@ -26,6 +26,7 @@ static struct usb_device_id id_table[] = { {USB_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ {USB_DEVICE(0x03f0, 0x1f1d)}, /* HP un2400 Gobi Modem Device */ {USB_DEVICE(0x03f0, 0x201d)}, /* HP un2400 Gobi QDL Device */ + {USB_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */ {USB_DEVICE(0x04da, 0x250d)}, /* Panasonic Gobi Modem device */ {USB_DEVICE(0x04da, 0x250c)}, /* Panasonic Gobi QDL device */ {USB_DEVICE(0x413c, 0x8172)}, /* Dell Gobi Modem device */
@@ -75,6 +76,7 @@ static struct usb_device_id id_table[] = { {USB_DEVICE(0x1199, 0x9008)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ {USB_DEVICE(0x1199, 0x9009)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ {USB_DEVICE(0x1199, 0x900a)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9011)}, /* Sierra Wireless Gobi 2000 Modem device (MC8305) */ {USB_DEVICE(0x16d8, 0x8001)}, /* CMDTech Gobi 2000 QDL device (VU922) */ {USB_DEVICE(0x16d8, 0x8002)}, /* CMDTech Gobi 2000 Modem device (VU922) */ { } /* Terminating entry */
drivers/usb/storage/transport.c +19 -15
@@ -693,6 +693,9 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)int temp_result;struct scsi_eh_save ses;int sense_size =US_SENSE_SIZE ; +struct scsi_sense_hdr sshdr; +const u8 *scdd; +u8 fm_ili;/* device supports and needs bigger sense buffer */ if (us->fflags &US_FL_SANE_SENSE )
@@ -776,32 +779,30 @@ Retry_Sense: srb->sense_buffer[7 ] = (US_SENSE_SIZE -8 ); } +scsi_normalize_sense (srb->sense_buffer,SCSI_SENSE_BUFFERSIZE , + &sshdr); +US_DEBUGP ("-- Result from auto-sense is %d\n" , temp_result);US_DEBUGP ("-- code: 0x%x, key: 0x%x, ASC: 0x%x, ASCQ: 0x%x\n" , - srb->sense_buffer[0 ], - srb->sense_buffer[2 ] &0xf , - srb->sense_buffer[12 ], - srb->sense_buffer[13 ]); + sshdr.response_code, sshdr.sense_key, + sshdr.asc, sshdr.ascq);#ifdef CONFIG_USB_STORAGE_DEBUG -usb_stor_show_sense ( - srb->sense_buffer[2 ] &0xf , - srb->sense_buffer[12 ], - srb->sense_buffer[13 ]); +usb_stor_show_sense (sshdr.sense_key, sshdr.asc, sshdr.ascq);#endif /* set the result so the higher layers expect this data */ srb->result =SAM_STAT_CHECK_CONDITION ; + scdd =scsi_sense_desc_find (srb->sense_buffer, +SCSI_SENSE_BUFFERSIZE ,4 ); + fm_ili = (scdd ? scdd[3 ] : srb->sense_buffer[2 ]) &0xA0 ; +/* We often get empty sense data. This could indicate that * everything worked or that there was an unspecified * problem. We have to decide which. */ -if (/* Filemark 0, ignore EOM, ILI 0, no sense */ - (srb->sense_buffer[2 ] &0xaf ) ==0 && -/* No ASC or ASCQ */ - srb->sense_buffer[12 ] ==0 && - srb->sense_buffer[13 ] ==0 ) { - +if (sshdr.sense_key ==0 && sshdr.asc ==0 && sshdr.ascq ==0 && + fm_ili ==0 ) {/* If things are really okay, then let's show that. * Zero out the sense buffer so the higher layers * won't realize we did an unsolicited auto-sense.
@@ -816,7 +817,10 @@ Retry_Sense:*/ }else { srb->result =DID_ERROR <<16 ; - srb->sense_buffer[2 ] =HARDWARE_ERROR ; +if ((sshdr.response_code &0x72 ) ==0x72 ) + srb->sense_buffer[1 ] =HARDWARE_ERROR ; +else + srb->sense_buffer[2 ] =HARDWARE_ERROR ; } } }
drivers/video/carminefb.c +3 -3
@@ -31,11 +31,11 @@#define CARMINEFB_DEFAULT_VIDEO_MODE 1static unsigned int fb_mode =CARMINEFB_DEFAULT_VIDEO_MODE ; -module_param (fb_mode, uint,444 ); +module_param (fb_mode, uint,0444 );MODULE_PARM_DESC (fb_mode,"Initial video mode as integer." );static char *fb_mode_str; -module_param (fb_mode_str, charp,444 ); +module_param (fb_mode_str, charp,0444 );MODULE_PARM_DESC (fb_mode_str,"Initial video mode in characters." );/*
@@ -45,7 +45,7 @@ MODULE_PARM_DESC(fb_mode_str, "Initial video mode in characters.");* 0b010 Display 1 */ static int fb_displays =CARMINE_USE_DISPLAY0 |CARMINE_USE_DISPLAY1 ; -module_param (fb_displays, int,444 ); +module_param (fb_displays, int,0444 );MODULE_PARM_DESC (fb_displays,"Bit mode, which displays are used" );struct carmine_hw {
drivers/watchdog/mtx-1_wdt.c +3 -2
@@ -211,13 +211,14 @@ static int __devinit mtx1_wdt_probe(struct platform_device *pdev)int ret; mtx1_wdt_device.gpio = pdev->resource[0 ].start; - ret =gpio_request_one (mtx1_wdt_device.gpio, -GPIOF_OUT_INIT_HIGH ,"mtx1-wdt" ); + ret =gpio_request (mtx1_wdt_device.gpio,"mtx1-wdt" );if (ret <0 ) {dev_err (&pdev->dev,"failed to request gpio" );return ret; } +gpio_direction_output (mtx1_wdt_device.gpio,1 ); +spin_lock_init (&mtx1_wdt_device.lock);init_completion (&mtx1_wdt_device.stop); mtx1_wdt_device.queue =0 ;
drivers/xen/events.c +1 -1
@@ -536,7 +536,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,if (irq <0 )return irq; - irqflags |=IRQF_NO_SUSPEND |IRQF_FORCE_RESUME ; + irqflags |=IRQF_NO_SUSPEND |IRQF_FORCE_RESUME |IRQF_EARLY_RESUME ; retval =request_irq (irq, handler, irqflags, devname, dev_id);if (retval !=0 ) {unbind_from_irq (irq);
fs/cifs/cifssmb.c +2 -1
@@ -3596,7 +3596,8 @@ int CIFSFindNext(const int xid, struct cifsTconInfo *tcon,T2_FNEXT_RSP_PARMS *parms;char *response_data;int rc =0 ; -int bytes_returned, name_len; +int bytes_returned; +unsigned int name_len;__u16 params, byte_count;cFYI (1 , ("In FindNext" ));
fs/eventpoll.c +18 -7
@@ -70,6 +70,15 @@* simultaneous inserts (A into B and B into A) from racing and * constructing a cycle without either insert observing that it is * going to. +* It is necessary to acquire multiple "ep->mtx"es at once in the +* case when one epoll fd is added to another. In this case, we +* always acquire the locks in the order of nesting (i.e. after +* epoll_ctl(e1, EPOLL_CTL_ADD, e2), e1->mtx will always be acquired +* before e2->mtx). Since we disallow cycles of epoll file +* descriptors, this ensures that the mutexes are well-ordered. In +* order to communicate this nesting to lockdep, when walking a tree +* of epoll file descriptors, we use the current recursion depth as +* the lockdep subkey. * It is possible to drop the "ep->mtx" and to use the global * mutex "epmutex" (together with "ep->lock") to have it working, * but having "ep->mtx" will make the interface more scalable.
@@ -452,13 +461,15 @@ static void ep_unregister_pollwait(struct eventpoll *ep, struct epitem *epi)* @ep: Pointer to the epoll private data structure. * @sproc: Pointer to the scan callback. * @priv: Private opaque data passed to the @sproc callback. +* @depth: The current depth of recursive f_op->poll calls. * * Returns: The same integer error code returned by the @sproc callback. */
Lines of this file are not shown. View the raw message.
fs/proc/base.c +50 -19
69 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Greg KH wrote...
Quoted 1 line
I'm announcing the release of the 2.6.32.47 kernel.
Unfortunately this does not build anymore on ARM (Debian armel):
CHK include/linux/version.h
SYMLINK include/asm -> include/asm-arm
make[1]: `include/asm-arm/mach-types.h' is up to date.
CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h GEN .version CHK include/linux/compile.h UPD include/linux/compile.h CC init/version.o LD init/built-in.o LD .tmp_vmlinux1
drivers/built-in.o: In function `sysdev_resume':
ledtrig-default-on.c:(.text+0x2a97c): undefined reference to `irq_pm_syscore_resume'
make: *** [.tmp_vmlinux1] Error 1
The most likely culprit is
commit 0f12a6ad9fa3a03f2bcee36c9cb704821e244c40
Author: Ian Campbell <[email protected]>
Date: Mon Oct 3 15:37:00 2011 +0100
genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
as reverting that commit made the error go away.
The .config used is attached. FWIW, the target system is a DockStar.
Sorry for not having checked during the review period, I should have done so.
Christoph
#
# Automatically generated make config: don't edit # Linux kernel version: 2.6.32.47
# Mon Nov 7 22:43:10 2011
#CONFIG_ARM=yCONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=yCONFIG_GENERIC_TIME=yCONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_HARDIRQS=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_VECTORS_BASE=0xffff0000 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y
#
# General setup
#CONFIG_EXPERIMENTAL=yCONFIG_BROKEN_ON_SMP=yCONFIG_INIT_ENV_ARG_LIMIT=32CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not setCONFIG_SWAP=yCONFIG_SYSVIPC=yCONFIG_SYSVIPC_SYSCTL=yCONFIG_POSIX_MQUEUE=yCONFIG_POSIX_MQUEUE_SYSCTL=yCONFIG_BSD_PROCESS_ACCT=yCONFIG_BSD_PROCESS_ACCT_V3=y
# CONFIG_TASKSTATS is not setCONFIG_AUDIT=y
#
# RCU Subsystem
#CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_RCU_TRACE is not setCONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not setCONFIG_IKCONFIG=yCONFIG_IKCONFIG_PROC=yCONFIG_LOG_BUF_SHIFT=17CONFIG_CGROUPS=y
# CONFIG_CGROUP_DEBUG is not setCONFIG_CGROUP_NS=yCONFIG_CGROUP_FREEZER=yCONFIG_CGROUP_DEVICE=yCONFIG_CPUSETS=yCONFIG_PROC_PID_CPUSET=yCONFIG_CGROUP_CPUACCT=y
# CONFIG_RESOURCE_COUNTERS is not setCONFIG_CGROUP_SCHED=yCONFIG_FAIR_GROUP_SCHED=y
# CONFIG_RT_GROUP_SCHED is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not setCONFIG_RELAY=y
# CONFIG_NAMESPACES is not setCONFIG_BLK_DEV_INITRD=yCONFIG_INITRAMFS_SOURCE=""CONFIG_RD_GZIP=yCONFIG_RD_BZIP2=yCONFIG_RD_LZMA=yCONFIG_CC_OPTIMIZE_FOR_SIZE=yCONFIG_SYSCTL=yCONFIG_ANON_INODES=yCONFIG_EMBEDDED=yCONFIG_UID16=yCONFIG_SYSCTL_SYSCALL=yCONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_ALL is not set
# CONFIG_KALLSYMS_EXTRA_PASS is not setCONFIG_HOTPLUG=yCONFIG_PRINTK=yCONFIG_BUG=yCONFIG_ELF_CORE=yCONFIG_BASE_FULL=yCONFIG_FUTEX=yCONFIG_EPOLL=yCONFIG_SIGNALFD=yCONFIG_TIMERFD=yCONFIG_EVENTFD=yCONFIG_SHMEM=yCONFIG_AIO=y
#
# Kernel Performance Events And Counters
#CONFIG_VM_EVENT_COUNTERS=y
# CONFIG_PCI_QUIRKS is not set
# CONFIG_SLUB_DEBUG is not set
# CONFIG_COMPAT_BRK is not set
# CONFIG_SLAB is not setCONFIG_SLUB=y
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not setCONFIG_HAVE_OPROFILE=yCONFIG_HAVE_KPROBES=yCONFIG_HAVE_KRETPROBES=y
#
# GCOV-based kernel profiling
#
# CONFIG_SLOW_WORK is not setCONFIG_HAVE_GENERIC_DMA_COHERENT=yCONFIG_RT_MUTEXES=yCONFIG_BASE_SMALL=0
# CONFIG_MODULES is not setCONFIG_BLOCK=yCONFIG_LBDAF=yCONFIG_BLK_DEV_BSG=yCONFIG_BLK_DEV_INTEGRITY=y
#
# IO Schedulers
#CONFIG_IOSCHED_NOOP=yCONFIG_IOSCHED_AS=yCONFIG_IOSCHED_DEADLINE=yCONFIG_IOSCHED_CFQ=y
# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not setCONFIG_DEFAULT_NOOP=yCONFIG_DEFAULT_IOSCHED="noop"CONFIG_FREEZER=y
#
# System Type
#CONFIG_MMU=y
# CONFIG_ARCH_AAEC2000 is not set
# CONFIG_ARCH_INTEGRATOR is not set
# CONFIG_ARCH_REALVIEW is not set
# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_GEMINI is not set
# CONFIG_ARCH_EBSA110 is not set
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_STMP3XXX is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
# CONFIG_ARCH_NOMADIK is not set
# CONFIG_ARCH_IOP13XX is not set
# CONFIG_ARCH_IOP32X is not set
# CONFIG_ARCH_IOP33X is not set
# CONFIG_ARCH_IXP23XX is not set
# CONFIG_ARCH_IXP2000 is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_L7200 is not setCONFIG_ARCH_KIRKWOOD=y
# CONFIG_ARCH_LOKI is not set
# CONFIG_ARCH_MV78XX0 is not set
# CONFIG_ARCH_ORION5X is not set
# CONFIG_ARCH_MMP is not set
# CONFIG_ARCH_KS8695 is not set
# CONFIG_ARCH_NS9XXX is not set
# CONFIG_ARCH_W90X900 is not set
# CONFIG_ARCH_PNX4008 is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_MSM is not set
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_S3C64XX is not set
# CONFIG_ARCH_S5PC1XX is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_U300 is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_BCMRING is not set
#
# Marvell Kirkwood Implementations
#CONFIG_MACH_DB88F6281_BP=yCONFIG_MACH_RD88F6192_NAS=yCONFIG_MACH_RD88F6281=yCONFIG_MACH_MV88F6281GTW_GE=yCONFIG_MACH_SHEEVAPLUG=yCONFIG_MACH_TS219=yCONFIG_MACH_OPENRD_BASE=yCONFIG_PLAT_ORION=y
#
# Processor Type
#CONFIG_CPU_32=yCONFIG_CPU_FEROCEON=yCONFIG_CPU_FEROCEON_OLD_ID=y
CONFIG_CPU_32v5=yCONFIG_CPU_ABRT_EV5T=yCONFIG_CPU_PABRT_LEGACY=yCONFIG_CPU_CACHE_VIVT=yCONFIG_CPU_COPY_FEROCEON=yCONFIG_CPU_TLB_FEROCEON=yCONFIG_CPU_CP15=yCONFIG_CPU_CP15_MMU=y
#
# Processor Features
#CONFIG_ARM_THUMB=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set CONFIG_OUTER_CACHE=y CONFIG_CACHE_FEROCEON_L2=y
# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set CONFIG_ARM_L1_CACHE_SHIFT=5
#
# Bus support
#CONFIG_PCI=yCONFIG_PCI_SYSCALL=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCI_IOV is not set
# CONFIG_PCCARD is not set
#
# Kernel Features
#CONFIG_TICK_ONESHOT=yCONFIG_NO_HZ=yCONFIG_HIGH_RES_TIMERS=yCONFIG_GENERIC_CLOCKEVENTS_BUILD=yCONFIG_VMSPLIT_3G=y
# CONFIG_VMSPLIT_2G is not set
# CONFIG_VMSPLIT_1G is not setCONFIG_PAGE_OFFSET=0xC0000000CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not setCONFIG_HZ=100CONFIG_AEABI=yCONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not setCONFIG_SELECT_MEMORY_MODEL=yCONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not setCONFIG_FLATMEM=yCONFIG_FLAT_NODE_MEM_MAP=yCONFIG_PAGEFLAGS_EXTENDED=yCONFIG_SPLIT_PTLOCK_CPUS=4096
# CONFIG_PHYS_ADDR_T_64BIT is not setCONFIG_ZONE_DMA_FLAG=0CONFIG_VIRT_TO_BUS=yCONFIG_HAVE_MLOCK=yCONFIG_HAVE_MLOCKED_PAGE_BIT=yCONFIG_KSM=yCONFIG_DEFAULT_MMAP_MIN_ADDR=4096CONFIG_ALIGNMENT_TRAP=yCONFIG_UACCESS_WITH_MEMCPY=y
#
# Boot options
#CONFIG_ZBOOT_ROM_TEXT=0x0CONFIG_ZBOOT_ROM_BSS=0x0CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not setCONFIG_KEXEC=yCONFIG_ATAGS_PROC=y
#
# CPU Power Management
#CONFIG_CPU_IDLE=yCONFIG_CPU_IDLE_GOV_LADDER=yCONFIG_CPU_IDLE_GOV_MENU=y
#
# Floating point emulation
#
#
# At least one emulation must be selected
#CONFIG_FPE_NWFPE=y
# CONFIG_FPE_NWFPE_XP is not set
# CONFIG_FPE_FASTFPE is not set
# CONFIG_VFP is not set
#
# Userspace binary formats
#CONFIG_BINFMT_ELF=yCONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=yCONFIG_HAVE_AOUT=y
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
#
# Power management options
#CONFIG_PM=yCONFIG_PM_DEBUG=y
# CONFIG_PM_VERBOSE is not set
# CONFIG_SUSPEND is not set
# CONFIG_APM_EMULATION is not setCONFIG_PM_RUNTIME=yCONFIG_ARCH_SUSPEND_POSSIBLE=yCONFIG_NET=y
#
# Networking options
#CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not setCONFIG_UNIX=yCONFIG_XFRM=y
# CONFIG_XFRM_USER is not set CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y
# CONFIG_XFRM_STATISTICS is not set CONFIG_XFRM_IPCOMP=y
# CONFIG_NET_KEY is not setCONFIG_INET=yCONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set CONFIG_INET_AH=yCONFIG_INET_ESP=yCONFIG_INET_IPCOMP=y CONFIG_INET_XFRM_TUNNEL=y CONFIG_INET_TUNNEL=y CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_LRO=y
# CONFIG_INET_DIAG is not set
# CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not setCONFIG_IPV6=yCONFIG_IPV6_PRIVACY=y
# CONFIG_IPV6_ROUTER_PREF is not set
# CONFIG_IPV6_OPTIMISTIC_DAD is not set CONFIG_INET6_AH=yCONFIG_INET6_ESP=yCONFIG_INET6_IPCOMP=yCONFIG_IPV6_MIP6=yCONFIG_INET6_XFRM_TUNNEL=y CONFIG_INET6_TUNNEL=y CONFIG_INET6_XFRM_MODE_TRANSPORT=y CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_INET6_XFRM_MODE_BEET=y
# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set # CONFIG_IPV6_SIT is not set
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_MULTIPLE_TABLES is not set
# CONFIG_IPV6_MROUTE is not set
# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set CONFIG_NETFILTER_ADVANCED=y CONFIG_BRIDGE_NETFILTER=y
#
# Core Netfilter Configuration
#CONFIG_NETFILTER_NETLINK=y CONFIG_NETFILTER_NETLINK_QUEUE=y CONFIG_NETFILTER_NETLINK_LOG=y CONFIG_NF_CONNTRACK=yCONFIG_NF_CT_ACCT=yCONFIG_NF_CONNTRACK_MARK=y
# CONFIG_NF_CONNTRACK_EVENTS is not set CONFIG_NF_CT_PROTO_DCCP=y CONFIG_NF_CT_PROTO_GRE=y CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_CONNTRACK_AMANDA=y CONFIG_NF_CONNTRACK_FTP=y CONFIG_NF_CONNTRACK_H323=y CONFIG_NF_CONNTRACK_IRC=y CONFIG_NF_CONNTRACK_NETBIOS_NS=y CONFIG_NF_CONNTRACK_PPTP=y CONFIG_NF_CONNTRACK_SANE=y CONFIG_NF_CONNTRACK_SIP=y CONFIG_NF_CONNTRACK_TFTP=y CONFIG_NF_CT_NETLINK=yCONFIG_NETFILTER_TPROXY=y CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y CONFIG_NETFILTER_XT_TARGET_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_DSCP=y CONFIG_NETFILTER_XT_TARGET_HL=y CONFIG_NETFILTER_XT_TARGET_LED=y CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y CONFIG_NETFILTER_XT_TARGET_NOTRACK=y CONFIG_NETFILTER_XT_TARGET_RATEEST=y CONFIG_NETFILTER_XT_TARGET_TPROXY=y CONFIG_NETFILTER_XT_TARGET_TRACE=y CONFIG_NETFILTER_XT_TARGET_TCPMSS=y CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y CONFIG_NETFILTER_XT_MATCH_CLUSTER=y CONFIG_NETFILTER_XT_MATCH_COMMENT=y CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y CONFIG_NETFILTER_XT_MATCH_CONNMARK=y CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y CONFIG_NETFILTER_XT_MATCH_DCCP=y CONFIG_NETFILTER_XT_MATCH_DSCP=y CONFIG_NETFILTER_XT_MATCH_ESP=y CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y CONFIG_NETFILTER_XT_MATCH_HELPER=y CONFIG_NETFILTER_XT_MATCH_HL=y CONFIG_NETFILTER_XT_MATCH_IPRANGE=y CONFIG_NETFILTER_XT_MATCH_LENGTH=y CONFIG_NETFILTER_XT_MATCH_LIMIT=y CONFIG_NETFILTER_XT_MATCH_MAC=y CONFIG_NETFILTER_XT_MATCH_MARK=y CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_POLICY=y CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y CONFIG_NETFILTER_XT_MATCH_QUOTA=y CONFIG_NETFILTER_XT_MATCH_RATEEST=y CONFIG_NETFILTER_XT_MATCH_REALM=y CONFIG_NETFILTER_XT_MATCH_RECENT=y
# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set CONFIG_NETFILTER_XT_MATCH_SCTP=y CONFIG_NETFILTER_XT_MATCH_SOCKET=y CONFIG_NETFILTER_XT_MATCH_STATE=y CONFIG_NETFILTER_XT_MATCH_STATISTIC=y CONFIG_NETFILTER_XT_MATCH_STRING=y CONFIG_NETFILTER_XT_MATCH_TCPMSS=y CONFIG_NETFILTER_XT_MATCH_TIME=y CONFIG_NETFILTER_XT_MATCH_U32=y CONFIG_NETFILTER_XT_MATCH_OSF=y
# CONFIG_IP_VS is not set
#
# IP: Netfilter Configuration
#CONFIG_NF_DEFRAG_IPV4=yCONFIG_NF_CONNTRACK_IPV4=yCONFIG_NF_CONNTRACK_PROC_COMPAT=y
# CONFIG_IP_NF_QUEUE is not setCONFIG_IP_NF_IPTABLES=yCONFIG_IP_NF_MATCH_ADDRTYPE=yCONFIG_IP_NF_MATCH_AH=yCONFIG_IP_NF_MATCH_ECN=yCONFIG_IP_NF_MATCH_TTL=yCONFIG_IP_NF_FILTER=yCONFIG_IP_NF_TARGET_REJECT=yCONFIG_IP_NF_TARGET_LOG=yCONFIG_IP_NF_TARGET_ULOG=yCONFIG_NF_NAT=yCONFIG_NF_NAT_NEEDED=yCONFIG_IP_NF_TARGET_MASQUERADE=yCONFIG_IP_NF_TARGET_NETMAP=yCONFIG_IP_NF_TARGET_REDIRECT=yCONFIG_NF_NAT_SNMP_BASIC=yCONFIG_NF_NAT_PROTO_DCCP=yCONFIG_NF_NAT_PROTO_GRE=yCONFIG_NF_NAT_PROTO_UDPLITE=yCONFIG_NF_NAT_PROTO_SCTP=yCONFIG_NF_NAT_FTP=yCONFIG_NF_NAT_IRC=yCONFIG_NF_NAT_TFTP=yCONFIG_NF_NAT_AMANDA=yCONFIG_NF_NAT_PPTP=yCONFIG_NF_NAT_H323=yCONFIG_NF_NAT_SIP=yCONFIG_IP_NF_MANGLE=yCONFIG_IP_NF_TARGET_CLUSTERIP=yCONFIG_IP_NF_TARGET_ECN=yCONFIG_IP_NF_TARGET_TTL=yCONFIG_IP_NF_RAW=yCONFIG_IP_NF_ARPTABLES=yCONFIG_IP_NF_ARPFILTER=yCONFIG_IP_NF_ARP_MANGLE=y
#
# IPv6: Netfilter Configuration
#CONFIG_NF_CONNTRACK_IPV6=y
# CONFIG_IP6_NF_QUEUE is not setCONFIG_IP6_NF_IPTABLES=yCONFIG_IP6_NF_MATCH_AH=yCONFIG_IP6_NF_MATCH_EUI64=yCONFIG_IP6_NF_MATCH_FRAG=yCONFIG_IP6_NF_MATCH_OPTS=yCONFIG_IP6_NF_MATCH_HL=yCONFIG_IP6_NF_MATCH_IPV6HEADER=yCONFIG_IP6_NF_MATCH_MH=yCONFIG_IP6_NF_MATCH_RT=yCONFIG_IP6_NF_TARGET_HL=yCONFIG_IP6_NF_TARGET_LOG=yCONFIG_IP6_NF_FILTER=yCONFIG_IP6_NF_TARGET_REJECT=yCONFIG_IP6_NF_MANGLE=yCONFIG_IP6_NF_RAW=y
# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
# CONFIG_RDS is not set
# CONFIG_TIPC is not set
# CONFIG_ATM is not setCONFIG_STP=yCONFIG_BRIDGE=y
# CONFIG_NET_DSA is not setCONFIG_VLAN_8021Q=y
# CONFIG_VLAN_8021Q_GVRP is not set
# CONFIG_DECNET is not setCONFIG_LLC=y
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_PHONET is not set
# CONFIG_IEEE802154 is not setCONFIG_NET_SCHED=y
#
# Queueing/Scheduling
#CONFIG_NET_SCH_CBQ=yCONFIG_NET_SCH_HTB=yCONFIG_NET_SCH_HFSC=yCONFIG_NET_SCH_PRIO=yCONFIG_NET_SCH_MULTIQ=yCONFIG_NET_SCH_RED=yCONFIG_NET_SCH_SFQ=yCONFIG_NET_SCH_TEQL=yCONFIG_NET_SCH_TBF=yCONFIG_NET_SCH_GRED=yCONFIG_NET_SCH_DSMARK=y
# CONFIG_NET_SCH_NETEM is not setCONFIG_NET_SCH_DRR=yCONFIG_NET_SCH_INGRESS=y
#
# Classification
#CONFIG_NET_CLS=yCONFIG_NET_CLS_BASIC=yCONFIG_NET_CLS_TCINDEX=yCONFIG_NET_CLS_ROUTE4=yCONFIG_NET_CLS_ROUTE=yCONFIG_NET_CLS_FW=yCONFIG_NET_CLS_U32=yCONFIG_CLS_U32_PERF=yCONFIG_CLS_U32_MARK=yCONFIG_NET_CLS_RSVP=yCONFIG_NET_CLS_RSVP6=yCONFIG_NET_CLS_FLOW=yCONFIG_NET_CLS_CGROUP=yCONFIG_NET_EMATCH=yCONFIG_NET_EMATCH_STACK=32CONFIG_NET_EMATCH_CMP=yCONFIG_NET_EMATCH_NBYTE=yCONFIG_NET_EMATCH_U32=yCONFIG_NET_EMATCH_META=yCONFIG_NET_EMATCH_TEXT=yCONFIG_NET_CLS_ACT=yCONFIG_NET_ACT_POLICE=yCONFIG_NET_ACT_GACT=yCONFIG_GACT_PROB=yCONFIG_NET_ACT_MIRRED=yCONFIG_NET_ACT_IPT=yCONFIG_NET_ACT_NAT=yCONFIG_NET_ACT_PEDIT=yCONFIG_NET_ACT_SIMP=yCONFIG_NET_ACT_SKBEDIT=yCONFIG_NET_CLS_IND=yCONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_WIRELESS is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
#
# Device Drivers
#
#
# Generic Driver Options
#CONFIG_UEVENT_HELPER_PATH=""CONFIG_DEVTMPFS=y
# CONFIG_DEVTMPFS_MOUNT is not setCONFIG_STANDALONE=yCONFIG_PREVENT_FIRMWARE_BUILD=yCONFIG_FW_LOADER=y
# CONFIG_FIRMWARE_IN_KERNEL is not setCONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not setCONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_CONCAT is not setCONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not setCONFIG_MTD_CMDLINE_PARTS=y
# CONFIG_MTD_AFS_PARTS is not set
# CONFIG_MTD_AR7_PARTS is not set
#
# User Modules And Translation Layers
#CONFIG_MTD_CHAR=yCONFIG_MTD_BLKDEVS=yCONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
# CONFIG_INFTL is not set
# CONFIG_RFD_FTL is not set
# CONFIG_SSFDC is not set
# CONFIG_MTD_OOPS is not set
#
# RAM/ROM/Flash chip drivers
#CONFIG_MTD_CFI=yCONFIG_MTD_JEDECPROBE=yCONFIG_MTD_GEN_PROBE=yCONFIG_MTD_CFI_ADV_OPTIONS=yCONFIG_MTD_CFI_NOSWAP=y
# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
# CONFIG_MTD_CFI_LE_BYTE_SWAP is not setCONFIG_MTD_CFI_GEOMETRY=yCONFIG_MTD_MAP_BANK_WIDTH_1=yCONFIG_MTD_MAP_BANK_WIDTH_2=yCONFIG_MTD_MAP_BANK_WIDTH_4=y
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not setCONFIG_MTD_CFI_I1=yCONFIG_MTD_CFI_I2=yCONFIG_MTD_CFI_I4=y
# CONFIG_MTD_CFI_I8 is not set
# CONFIG_MTD_OTP is not setCONFIG_MTD_CFI_INTELEXT=yCONFIG_MTD_CFI_AMDSTD=yCONFIG_MTD_CFI_STAA=yCONFIG_MTD_CFI_UTIL=yCONFIG_MTD_RAM=yCONFIG_MTD_ROM=y
# CONFIG_MTD_ABSENT is not set
#
# Mapping drivers for chip access
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not setCONFIG_MTD_PHYSMAP=y
# CONFIG_MTD_PHYSMAP_COMPAT is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_IMPA7 is not set
# CONFIG_MTD_INTEL_VR_NOR is not set
# CONFIG_MTD_PLATRAM is not set
#
# Self-contained MTD device drivers
#
# CONFIG_MTD_PMC551 is not setCONFIG_MTD_DATAFLASH=y
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
# CONFIG_MTD_DATAFLASH_OTP is not setCONFIG_MTD_M25P80=yCONFIG_M25PXX_USE_FAST_READ=yCONFIG_MTD_SST25L=y
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_PHRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLOCK2MTD is not set
#
# Disk-On-Chip Device Drivers
#
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
# CONFIG_MTD_DOC2001PLUS is not setCONFIG_MTD_NAND=y
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
# CONFIG_MTD_NAND_ECC_SMC is not set
# CONFIG_MTD_NAND_MUSEUM_IDS is not set
# CONFIG_MTD_NAND_GPIO is not setCONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_CAFE is not set
# CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_ALAUDA is not setCONFIG_MTD_NAND_ORION=y
# CONFIG_MTD_ONENAND is not set
#
# LPDDR flash memory drivers
#CONFIG_MTD_LPDDR=yCONFIG_MTD_QINFO_PROBE=y
#
# UBI - Unsorted block images
#CONFIG_MTD_UBI=yCONFIG_MTD_UBI_WL_THRESHOLD=4096CONFIG_MTD_UBI_BEB_RESERVE=1
# CONFIG_MTD_UBI_GLUEBI is not set
#
# UBI debugging options
#
# CONFIG_MTD_UBI_DEBUG is not set
# CONFIG_PARPORT is not setCONFIG_BLK_DEV=y
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
# CONFIG_BLK_DEV_LOOP is not setCONFIG_BLK_DEV_NBD=y
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_CDROM_PKTCDVD is not setCONFIG_ATA_OVER_ETH=y
# CONFIG_MG_DISK is not setCONFIG_MISC_DEVICES=y
# CONFIG_PHANTOM is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_HP_ILO is not set
# CONFIG_ISL29003 is not set
# CONFIG_C2PORT is not set
#
# EEPROM support
#
# CONFIG_EEPROM_AT24 is not set
# CONFIG_EEPROM_AT25 is not set
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_CB710_CORE is not setCONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
#
# SCSI device support
#
# CONFIG_RAID_ATTRS is not setCONFIG_SCSI=yCONFIG_SCSI_DMA=y
# CONFIG_SCSI_TGT is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_PROC_FS is not set
#
# SCSI support type (disk, tape, CD-ROM)
#CONFIG_BLK_DEV_SD=y
# CONFIG_CHR_DEV_ST is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_BLK_DEV_SR is not set
# CONFIG_CHR_DEV_SG is not set
# CONFIG_CHR_DEV_SCH is not set
# CONFIG_SCSI_MULTI_LUN is not set
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
#
# SCSI Transports
#
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not set
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_DH is not set
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_ATA is not setCONFIG_MD=y
# CONFIG_BLK_DEV_MD is not setCONFIG_BLK_DEV_DM=y
# CONFIG_DM_DEBUG is not setCONFIG_DM_CRYPT=yCONFIG_DM_SNAPSHOT=yCONFIG_DM_MIRROR=y
# CONFIG_DM_LOG_USERSPACE is not setCONFIG_DM_ZERO=y
# CONFIG_DM_MULTIPATH is not set
# CONFIG_DM_DELAY is not setCONFIG_DM_UEVENT=y
# CONFIG_FUSION is not set
#
# IEEE 1394 (FireWire) support
#
#
# You can enable one or both FireWire driver stacks. #
#
# See the help texts for more information.
#
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
# CONFIG_I2O is not setCONFIG_NETDEVICES=y
# CONFIG_IFB is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
# CONFIG_EQUALIZER is not setCONFIG_TUN=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not setCONFIG_PHYLIB=y
#
# MII PHY device drivers
#CONFIG_MARVELL_PHY=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_QSEMI_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_CICADA_PHY is not set
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_NET_ETHERNET is not setCONFIG_MII=yCONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_E1000E is not set
# CONFIG_IP1000 is not set
# CONFIG_IGB is not set
# CONFIG_IGBVF is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SIS190 is not set
# CONFIG_SKGE is not set
# CONFIG_SKY2 is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 is not set
# CONFIG_BNX2 is not set
# CONFIG_CNIC is not setCONFIG_MV643XX_ETH=y
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
# CONFIG_ATL1E is not set
# CONFIG_ATL1C is not set
# CONFIG_JME is not set
# CONFIG_NETDEV_10000 is not set
# CONFIG_TR is not set
# CONFIG_WLAN is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers #
#
# USB Network Adapters
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_KAWETH is not setCONFIG_USB_PEGASUS=y
# CONFIG_USB_RTL8150 is not setCONFIG_USB_USBNET=y
# CONFIG_USB_NET_AX8817X is not set
# CONFIG_USB_NET_CDCETHER is not set
# CONFIG_USB_NET_CDC_EEM is not set
# CONFIG_USB_NET_DM9601 is not set
# CONFIG_USB_NET_SMSC95XX is not set
# CONFIG_USB_NET_GL620A is not set
# CONFIG_USB_NET_NET1080 is not set
# CONFIG_USB_NET_PLUSB is not setCONFIG_USB_NET_MCS7830=y
# CONFIG_USB_NET_RNDIS_HOST is not set
# CONFIG_USB_NET_CDC_SUBSET is not set
# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_USB_NET_INT51X1 is not set
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not setCONFIG_PPP=yCONFIG_PPP_MULTILINK=yCONFIG_PPP_FILTER=yCONFIG_PPP_ASYNC=yCONFIG_PPP_SYNC_TTY=yCONFIG_PPP_DEFLATE=yCONFIG_PPP_BSDCOMP=yCONFIG_PPP_MPPE=y
# CONFIG_PPPOE is not set
# CONFIG_PPPOL2TP is not set
# CONFIG_SLIP is not setCONFIG_SLHC=y
# CONFIG_NET_FC is not setCONFIG_NETCONSOLE=yCONFIG_NETCONSOLE_DYNAMIC=yCONFIG_NETPOLL=y
# CONFIG_NETPOLL_TRAP is not setCONFIG_NET_POLL_CONTROLLER=y
# CONFIG_ISDN is not set
# CONFIG_PHONE is not set
#
# Input device support
#CONFIG_INPUT=y
# CONFIG_INPUT_FF_MEMLESS is not set
# CONFIG_INPUT_POLLDEV is not set
#
# Userland interfaces
#
# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
#
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not setCONFIG_INPUT_MISC=y
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
# CONFIG_INPUT_KEYSPAN_REMOTE is not set
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 is not set
# CONFIG_INPUT_UINPUT is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
#
# Hardware I/O ports
#CONFIG_SERIO=yCONFIG_SERIO_SERPORT=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_RAW is not set
# CONFIG_GAMEPORT is not set
#
# Character devices
#CONFIG_VT=yCONFIG_CONSOLE_TRANSLATIONS=yCONFIG_VT_CONSOLE=yCONFIG_HW_CONSOLE=yCONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_DEVKMEM is not set
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_NOZOMI is not set
#
# Serial drivers
#CONFIG_SERIAL_8250=yCONFIG_SERIAL_8250_CONSOLE=yCONFIG_SERIAL_8250_PCI=yCONFIG_SERIAL_8250_NR_UARTS=4CONFIG_SERIAL_8250_RUNTIME_UARTS=2
# CONFIG_SERIAL_8250_EXTENDED is not set
#
# Non-8250 serial port support
#
# CONFIG_SERIAL_MAX3100 is not setCONFIG_SERIAL_CORE=yCONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not setCONFIG_UNIX98_PTYS=yCONFIG_DEVPTS_MULTIPLE_INSTANCES=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not setCONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_TCG_TPM is not setCONFIG_DEVPORT=yCONFIG_I2C=yCONFIG_I2C_BOARDINFO=y
# CONFIG_I2C_COMPAT is not setCONFIG_I2C_CHARDEV=yCONFIG_I2C_HELPER_AUTO=y
#
# I2C Hardware Bus support
#
#
# PC SMBus host controller drivers
#
# CONFIG_I2C_ALI1535 is not set
# CONFIG_I2C_ALI1563 is not set
# CONFIG_I2C_ALI15X3 is not set
# CONFIG_I2C_AMD756 is not set
# CONFIG_I2C_AMD8111 is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_ISCH is not set
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
# CONFIG_I2C_SIS96X is not set
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
#
# I2C system bus drivers (mostly embedded / system-on-chip) #
# CONFIG_I2C_GPIO is not setCONFIG_I2C_MV64XXX=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_SIMTEC is not set
#
# External I2C/SMBus adapter drivers
#
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_TAOS_EVM is not set
# CONFIG_I2C_TINY_USB is not set
#
# Graphics adapter I2C/DDC channel drivers
#
# CONFIG_I2C_VOODOO3 is not set
#
# Other I2C/SMBus bus drivers
#
# CONFIG_I2C_PCA_PLATFORM is not set
#
# Miscellaneous I2C Chip support
#
# CONFIG_DS1682 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CHIP is not setCONFIG_SPI=y
# CONFIG_SPI_DEBUG is not setCONFIG_SPI_MASTER=y
#
# SPI Master Controller Drivers
#
# CONFIG_SPI_BITBANG is not set
# CONFIG_SPI_GPIO is not setCONFIG_SPI_ORION=y
#
# SPI Protocol Masters
#
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
#
# PPS support
#
# CONFIG_PPS is not setCONFIG_ARCH_REQUIRE_GPIOLIB=yCONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not setCONFIG_GPIO_SYSFS=y
#
# Memory mapped GPIO expanders:
#
#
# I2C GPIO expanders:
#
# CONFIG_GPIO_MAX732X is not set
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
#
# PCI GPIO expanders:
#
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_LANGWELL is not set
#
# SPI GPIO expanders:
#
# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MC33880 is not set
#
# AC97 GPIO expanders:
#
# CONFIG_W1 is not set
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
# CONFIG_WATCHDOG is not setCONFIG_SSB_POSSIBLE=y
#
# Sonics Silicon Backplane
#
# CONFIG_SSB is not set
#
# Multifunction device drivers
#
# CONFIG_MFD_CORE is not set
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_TPS65010 is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_TC6393XB is not set
# CONFIG_PMIC_DA903X is not set
# CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM831X is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_PCF50633 is not set
# CONFIG_MFD_MC13783 is not set
# CONFIG_AB3100_CORE is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
#
# Graphics support
#
# CONFIG_VGA_ARB is not set
# CONFIG_DRM is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
# CONFIG_FB is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Display device support
#
# CONFIG_DISPLAY_SUPPORT is not set
#
# Console display driver support
#
# CONFIG_VGA_CONSOLE is not setCONFIG_DUMMY_CONSOLE=y
# CONFIG_SOUND is not set
# CONFIG_HID_SUPPORT is not setCONFIG_USB_SUPPORT=yCONFIG_USB_ARCH_HAS_HCD=yCONFIG_USB_ARCH_HAS_OHCI=yCONFIG_USB_ARCH_HAS_EHCI=yCONFIG_USB=y
# CONFIG_USB_DEBUG is not setCONFIG_USB_ANNOUNCE_NEW_DEVICES=y
#
# Miscellaneous USB options
#CONFIG_USB_DEVICEFS=y
# CONFIG_USB_DEVICE_CLASS is not setCONFIG_USB_DYNAMIC_MINORS=yCONFIG_USB_SUSPEND=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
# CONFIG_USB_MON is not set
# CONFIG_USB_WUSB is not set
# CONFIG_USB_WUSB_CBAF is not set
#
# USB Host Controller Drivers
#
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_XHCI_HCD is not setCONFIG_USB_EHCI_HCD=yCONFIG_USB_EHCI_ROOT_HUB_TT=y
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
# CONFIG_USB_OXU210HP_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_ISP1362_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
# CONFIG_USB_UHCI_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_WHCI_HCD is not set
# CONFIG_USB_HWA_HCD is not set
# CONFIG_USB_MUSB_HDRC is not set
#
# USB Device Class drivers
#
# CONFIG_USB_ACM is not set
# CONFIG_USB_PRINTER is not set
# CONFIG_USB_WDM is not set
# CONFIG_USB_TMC is not set
#
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may #
#
# also be needed; see USB_STORAGE Help for more info # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set CONFIG_USB_STORAGE_DATAFAB=y CONFIG_USB_STORAGE_FREECOM=y CONFIG_USB_STORAGE_ISD200=y CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_SDDR09=y CONFIG_USB_STORAGE_SDDR55=y CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_ALAUDA=y CONFIG_USB_STORAGE_ONETOUCH=y CONFIG_USB_STORAGE_KARMA=y CONFIG_USB_STORAGE_CYPRESS_ATACB=y CONFIG_USB_LIBUSUAL=y
#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
# CONFIG_USB_MICROTEK is not set
#
# USB port drivers
#CONFIG_USB_SERIAL=yCONFIG_USB_SERIAL_CONSOLE=yCONFIG_USB_EZUSB=yCONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_AIRCABLE is not set
# CONFIG_USB_SERIAL_ARK3116 is not set
# CONFIG_USB_SERIAL_BELKIN is not set
# CONFIG_USB_SERIAL_CH341 is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_CP210X is not set
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
# CONFIG_USB_SERIAL_EMPEG is not set
# CONFIG_USB_SERIAL_FTDI_SIO is not set
# CONFIG_USB_SERIAL_FUNSOFT is not set
# CONFIG_USB_SERIAL_VISOR is not set
# CONFIG_USB_SERIAL_IPAQ is not set
# CONFIG_USB_SERIAL_IR is not set
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_GARMIN is not set
# CONFIG_USB_SERIAL_IPW is not set
# CONFIG_USB_SERIAL_IUU is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
# CONFIG_USB_SERIAL_KEYSPAN is not set
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_MOS7720 is not set
# CONFIG_USB_SERIAL_MOS7840 is not set
# CONFIG_USB_SERIAL_MOTOROLA is not set
# CONFIG_USB_SERIAL_NAVMAN is not setCONFIG_USB_SERIAL_PL2303=y
# CONFIG_USB_SERIAL_OTI6858 is not set
# CONFIG_USB_SERIAL_QUALCOMM is not set
# CONFIG_USB_SERIAL_SPCP8X5 is not set
# CONFIG_USB_SERIAL_HP4X is not set
# CONFIG_USB_SERIAL_SAFE is not set
# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
# CONFIG_USB_SERIAL_SYMBOL is not set
# CONFIG_USB_SERIAL_TI is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
# CONFIG_USB_SERIAL_OPTION is not set
# CONFIG_USB_SERIAL_OMNINET is not set
# CONFIG_USB_SERIAL_OPTICON is not set
# CONFIG_USB_SERIAL_DEBUG is not set
#
# USB Miscellaneous drivers
#
# CONFIG_USB_EMI62 is not set
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_ADUTUX is not set
# CONFIG_USB_SEVSEG is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_BERRY_CHARGE is not set
# CONFIG_USB_LED is not set
# CONFIG_USB_CYPRESS_CY7C63 is not set
# CONFIG_USB_CYTHERM is not set
# CONFIG_USB_IDMOUSE is not set
# CONFIG_USB_FTDI_ELAN is not set
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_SISUSBVGA is not set
# CONFIG_USB_LD is not set
# CONFIG_USB_TRANCEVIBRATOR is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_VST is not set
# CONFIG_USB_GADGET is not set
#
# OTG and related infrastructure
#
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_UWB is not setCONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
#
# MMC/SD/SDIO Card Drivers
#
# CONFIG_MMC_BLOCK is not set
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
#
# MMC/SD/SDIO Host Controller Drivers
#
# CONFIG_MMC_SDHCI is not set
# CONFIG_MMC_AT91 is not set
# CONFIG_MMC_ATMELMCI is not set
# CONFIG_MMC_TIFM_SD is not setCONFIG_MMC_MVSDIO=y
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_CB710 is not set
# CONFIG_MMC_VIA_SDMMC is not set
# CONFIG_MEMSTICK is not setCONFIG_NEW_LEDS=yCONFIG_LEDS_CLASS=y
#
# LED drivers
#
# CONFIG_LEDS_PCA9532 is not setCONFIG_LEDS_GPIO=yCONFIG_LEDS_GPIO_PLATFORM=y
# CONFIG_LEDS_LP3944 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_BD2802 is not set
#
# LED Triggers
#CONFIG_LEDS_TRIGGERS=y
# CONFIG_LEDS_TRIGGER_TIMER is not set
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
# CONFIG_LEDS_TRIGGER_GPIO is not setCONFIG_LEDS_TRIGGER_DEFAULT_ON=y
#
# iptables trigger is under Netfilter config (LED target) # # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set
#
# RTC interfaces
#CONFIG_RTC_INTF_SYSFS=yCONFIG_RTC_INTF_PROC=yCONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
#
# I2C RTC drivers
#
# CONFIG_RTC_DRV_DS1307 is not set
# CONFIG_RTC_DRV_DS1374 is not set
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_MAX6900 is not set
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_PCF8563 is not set
# CONFIG_RTC_DRV_PCF8583 is not set
# CONFIG_RTC_DRV_M41T80 is not set
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set
# CONFIG_RTC_DRV_RX8581 is not set
# CONFIG_RTC_DRV_RX8025 is not set
#
# SPI RTC drivers
#
# CONFIG_RTC_DRV_M41T94 is not set
# CONFIG_RTC_DRV_DS1305 is not set
# CONFIG_RTC_DRV_DS1390 is not set
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_R9701 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
# CONFIG_RTC_DRV_DS3234 is not set
# CONFIG_RTC_DRV_PCF2123 is not set
#
# Platform RTC drivers
#
# CONFIG_RTC_DRV_CMOS is not set
# CONFIG_RTC_DRV_DS1286 is not set
# CONFIG_RTC_DRV_DS1511 is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_DS1742 is not set
# CONFIG_RTC_DRV_STK17TA8 is not set
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_M48T35 is not set
# CONFIG_RTC_DRV_M48T59 is not set
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_V3020 is not set
#
# on-CPU RTC drivers
#CONFIG_RTC_DRV_MV=y
# CONFIG_DMADEVICES is not set
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
#
# TI VLYNQ
#
# CONFIG_STAGING is not set
#
# File systems
#CONFIG_EXT2_FS=yCONFIG_EXT2_FS_XATTR=yCONFIG_EXT2_FS_POSIX_ACL=yCONFIG_EXT2_FS_SECURITY=y
# CONFIG_EXT2_FS_XIP is not setCONFIG_EXT3_FS=yCONFIG_EXT3_DEFAULTS_TO_ORDERED=yCONFIG_EXT3_FS_XATTR=yCONFIG_EXT3_FS_POSIX_ACL=yCONFIG_EXT3_FS_SECURITY=yCONFIG_EXT4_FS=yCONFIG_EXT4_FS_XATTR=yCONFIG_EXT4_FS_POSIX_ACL=yCONFIG_EXT4_FS_SECURITY=y
# CONFIG_EXT4_DEBUG is not setCONFIG_JBD=yCONFIG_JBD2=yCONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not setCONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not setCONFIG_FILE_LOCKING=yCONFIG_FSNOTIFY=yCONFIG_DNOTIFY=yCONFIG_INOTIFY=yCONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not setCONFIG_FUSE_FS=y
# CONFIG_CUSE is not setCONFIG_GENERIC_ACL=y
#
# Caches
#
# CONFIG_FSCACHE is not set
#
# CD-ROM/DVD Filesystems
#
# CONFIG_ISO9660_FS is not set
# CONFIG_UDF_FS is not set
#
# DOS/FAT/NT Filesystems
#
# CONFIG_MSDOS_FS is not set
# CONFIG_VFAT_FS is not set
# CONFIG_NTFS_FS is not set
#
# Pseudo filesystems
#CONFIG_PROC_FS=yCONFIG_PROC_SYSCTL=yCONFIG_PROC_PAGE_MONITOR=yCONFIG_SYSFS=yCONFIG_TMPFS=yCONFIG_TMPFS_POSIX_ACL=y
# CONFIG_HUGETLB_PAGE is not setCONFIG_CONFIGFS_FS=yCONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ECRYPT_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not setCONFIG_JFFS2_FS=yCONFIG_JFFS2_FS_DEBUG=0CONFIG_JFFS2_FS_WRITEBUFFER=y
# CONFIG_JFFS2_FS_WBUF_VERIFY is not setCONFIG_JFFS2_SUMMARY=yCONFIG_JFFS2_FS_XATTR=yCONFIG_JFFS2_FS_POSIX_ACL=yCONFIG_JFFS2_FS_SECURITY=yCONFIG_JFFS2_COMPRESSION_OPTIONS=yCONFIG_JFFS2_ZLIB=yCONFIG_JFFS2_LZO=yCONFIG_JFFS2_RTIME=y
# CONFIG_JFFS2_RUBIN is not set
# CONFIG_JFFS2_CMODE_NONE is not setCONFIG_JFFS2_CMODE_PRIORITY=y
# CONFIG_JFFS2_CMODE_SIZE is not set
# CONFIG_JFFS2_CMODE_FAVOURLZO is not setCONFIG_UBIFS_FS=yCONFIG_UBIFS_FS_XATTR=yCONFIG_UBIFS_FS_ADVANCED_COMPR=yCONFIG_UBIFS_FS_LZO=yCONFIG_UBIFS_FS_ZLIB=y
# CONFIG_UBIFS_FS_DEBUG is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not setCONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
# CONFIG_SMB_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_AFS_FS is not set
#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not setCONFIG_MSDOS_PARTITION=yCONFIG_NLS=yCONFIG_NLS_DEFAULT="utf8"
# CONFIG_NLS_CODEPAGE_437 is not set
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
# CONFIG_NLS_ASCII is not set
# CONFIG_NLS_ISO8859_1 is not set
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
# CONFIG_NLS_ISO8859_15 is not set
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not setCONFIG_NLS_UTF8=y
# CONFIG_DLM is not set
#
# Kernel hacking
#CONFIG_PRINTK_TIME=yCONFIG_ENABLE_WARN_DEPRECATED=yCONFIG_ENABLE_MUST_CHECK=yCONFIG_FRAME_WARN=1024CONFIG_MAGIC_SYSRQ=yCONFIG_STRIP_ASM_SYMS=yCONFIG_UNUSED_SYMBOLS=y
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not setCONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not setCONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not setCONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0CONFIG_DETECT_HUNG_TASK=y
# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not setCONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0CONFIG_SCHED_DEBUG=y
# CONFIG_SCHEDSTATS is not setCONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_LOCK_ALLOC is not set
# CONFIG_PROVE_LOCKING is not set
# CONFIG_LOCK_STAT is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_INFO is not set
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_DEBUG_LIST is not set
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_NOTIFIERS is not set
# CONFIG_DEBUG_CREDENTIALS is not set
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_BACKTRACE_SELF_TEST is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
# CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
# CONFIG_PAGE_POISONING is not setCONFIG_HAVE_FUNCTION_TRACER=yCONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_SAMPLES is not setCONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not setCONFIG_ARM_UNWIND=y
# CONFIG_DEBUG_USER is not set
# CONFIG_DEBUG_ERRORS is not set
# CONFIG_DEBUG_STACK_USAGE is not setCONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set
#
# Security options
#CONFIG_KEYS=yCONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not setCONFIG_SECURITY_FILE_CAPABILITIES=yCONFIG_CRYPTO=y
#
# Crypto core or helper
#CONFIG_CRYPTO_ALGAPI=yCONFIG_CRYPTO_ALGAPI2=yCONFIG_CRYPTO_AEAD=yCONFIG_CRYPTO_AEAD2=yCONFIG_CRYPTO_BLKCIPHER=yCONFIG_CRYPTO_BLKCIPHER2=yCONFIG_CRYPTO_HASH=yCONFIG_CRYPTO_HASH2=yCONFIG_CRYPTO_RNG2=yCONFIG_CRYPTO_PCOMP=yCONFIG_CRYPTO_MANAGER=yCONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not setCONFIG_CRYPTO_WORKQUEUE=y
# CONFIG_CRYPTO_CRYPTD is not setCONFIG_CRYPTO_AUTHENC=y
#
# Authenticated Encryption with Associated Data
#
# CONFIG_CRYPTO_CCM is not set
# CONFIG_CRYPTO_GCM is not set
# CONFIG_CRYPTO_SEQIV is not set
#
# Block modes
#CONFIG_CRYPTO_CBC=y
# CONFIG_CRYPTO_CTR is not set
# CONFIG_CRYPTO_CTS is not setCONFIG_CRYPTO_ECB=y
# CONFIG_CRYPTO_LRW is not set
# CONFIG_CRYPTO_PCBC is not set
# CONFIG_CRYPTO_XTS is not set
#
# Hash modes
#CONFIG_CRYPTO_HMAC=y
# CONFIG_CRYPTO_XCBC is not set
# CONFIG_CRYPTO_VMAC is not set
#
# Digest
#CONFIG_CRYPTO_CRC32C=y
# CONFIG_CRYPTO_GHASH is not set
# CONFIG_CRYPTO_MD4 is not setCONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_RMD128 is not set
# CONFIG_CRYPTO_RMD160 is not set
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not setCONFIG_CRYPTO_SHA1=y
# CONFIG_CRYPTO_SHA256 is not set
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_WP512 is not set
#
# Ciphers
#CONFIG_CRYPTO_AES=y
# CONFIG_CRYPTO_ANUBIS is not setCONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_CAST5 is not set
# CONFIG_CRYPTO_CAST6 is not setCONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_KHAZAD is not set
# CONFIG_CRYPTO_SALSA20 is not set
# CONFIG_CRYPTO_SEED is not set
# CONFIG_CRYPTO_SERPENT is not set
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_TWOFISH is not set
#
# Compression
#CONFIG_CRYPTO_DEFLATE=y
# CONFIG_CRYPTO_ZLIB is not setCONFIG_CRYPTO_LZO=y
#
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not setCONFIG_CRYPTO_HW=yCONFIG_CRYPTO_DEV_MV_CESA=y
# CONFIG_CRYPTO_DEV_HIFN_795X is not set
# CONFIG_BINARY_PRINTF is not set
#
# Library routines
#CONFIG_BITREVERSE=yCONFIG_GENERIC_FIND_LAST_BIT=yCONFIG_CRC_CCITT=yCONFIG_CRC16=yCONFIG_CRC_T10DIF=y
# CONFIG_CRC_ITU_T is not setCONFIG_CRC32=y
# CONFIG_CRC7 is not setCONFIG_LIBCRC32C=yCONFIG_AUDIT_GENERIC=yCONFIG_ZLIB_INFLATE=yCONFIG_ZLIB_DEFLATE=yCONFIG_LZO_COMPRESS=yCONFIG_LZO_DECOMPRESS=yCONFIG_DECOMPRESS_GZIP=yCONFIG_DECOMPRESS_BZIP2=yCONFIG_DECOMPRESS_LZMA=yCONFIG_TEXTSEARCH=yCONFIG_TEXTSEARCH_KMP=yCONFIG_TEXTSEARCH_BM=yCONFIG_TEXTSEARCH_FSM=yCONFIG_HAS_IOMEM=yCONFIG_HAS_IOPORT=yCONFIG_HAS_DMA=yCONFIG_NLATTR=y
Quoted 29 lines · Christoph Biedl
Greg KH wrote...
Quoted 1 line
I'm announcing the release of the 2.6.32.47 kernel.
Unfortunately this does not build anymore on ARM (Debian armel):
CHK
include/linux/version.h
SYMLINKinclude/asm->include/asm-arm
make[1]: `include/asm-arm/mach-types.h' is up to date.CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h GEN .version CHK include/linux/compile.h UPD include/linux/compile.h CC init/version.o LD init/built-in.o LD .tmp_vmlinux1
drivers/built-in.o: In function `sysdev_resume':
ledtrig-default-on.c:(.text+0x2a97c): undefined reference to `irq_pm_syscore_resume'
make: *** [.tmp_vmlinux1] Error 1The most likely culprit is
commit
0f12a6ad9fa3a03f2bcee36c9cb704821e244c40
Author: Ian Campbell <[email protected]>
Date: Mon Oct 3 15:37:00 2011 +0100
Quoted 8 lines
genirq: Add
IRQF_RESUME_EARLYand resume such IRQs earlieras reverting that commit made the error go away.
The .config used is attached. FWIW, the target system is a DockStar.
Sorry for not having checked during the review period, I should have done so.
Not good.
Ian, Konrad, any thoughts as to how to fix this?
Christoph, sorry I didn't catch this, I need to get my ARM system back up and running for simple build things like this.
greg k-h
Quoted 34 lines · Greg KH
Quoted 33 lines · Christoph Biedl
Greg KH wrote...
Quoted 1 line
I'm announcing the release of the 2.6.32.47 kernel.
Unfortunately this does not build anymore on ARM (Debian armel):
CHK
include/linux/version.h
SYMLINKinclude/asm->include/asm-arm
make[1]: `include/asm-arm/mach-types.h' is up to date.CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h GEN .version CHK include/linux/compile.h UPD include/linux/compile.h CC init/version.o LD init/built-in.o LD .tmp_vmlinux1
drivers/built-in.o: In function `sysdev_resume':
ledtrig-default-on.c:(.text+0x2a97c): undefined reference to `irq_pm_syscore_resume'
make: *** [.tmp_vmlinux1] Error 1The most likely culprit is
commit
0f12a6ad9fa3a03f2bcee36c9cb704821e244c40
Author: Ian Campbell <[email protected]>
Date: Mon Oct 3 15:37:00 2011 +0100genirq: Add
IRQF_RESUME_EARLYand resume such IRQs earlieras reverting that commit made the error go away.
Quoted 8 lines
Quoted 4 lines
The .config used is attached. FWIW, the target system is a DockStar.
Sorry for not having checked during the review period, I should have done so.
Not good.
Ian, Konrad, any thoughts as to how to fix this?
Looks like I got the wrong CONFIG symbol for the function, or more importantly the dummy version of it. Sorry about this.
Ian.
8<--------------------------------------------------------------
Quoted 1 line
From
33a64cf4a184b47493ef312b08468aca3361e112Mon Sep 17 00:00:00 2001
From: Ian Campbell <[email protected]>
Date: Tue, 8 Nov 2011 07:19:06 +0000
Subject: [PATCH] irq: fix build error due to missing irq_pm_syscore_resume
irq_pm_syscore_resume is only available iff CONFIG_PM_SLEEP (kernel/irq/pm.o is only built if this is true). Move the definition (and the dummy definition) under that umbrella.
Introduced by the backport of upstream 9bab0b7fbaceec47d32db51cd9e59c82fb071f5a as 0f12a6ad9fa3a03f2bcee36c9cb704821e244c40.
--- include/linux/interrupt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/interrupt.h +2 -2
@@ -199,16 +199,16 @@ extern void enable_irq(unsigned int irq);#ifdef CONFIG_GENERIC_HARDIRQS extern void suspend_device_irqs (void );extern void resume_device_irqs (void ); -extern void irq_pm_syscore_resume (void );#ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs (void ); +extern void irq_pm_syscore_resume (void );#else static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #else static inline void suspend_device_irqs (void ) { };static inline void resume_device_irqs (void ) { }; -static inline void irq_pm_syscore_resume (void ) { };static inline int check_wakeup_irqs (void ) {return 0 ; }#endif
Signature · 1 line
1.7.2.5
Ian Campbell wrote...
Quoted 3 lines
From: Ian Campbell <[email protected]>
Date: Tue, 8 Nov 2011 07:19:06 +0000
Subject: [PATCH] irq: fix build error due to missingirq_pm_syscore_resume
Thanks, works for me. Kernel compiles, new kernel is running.
Christoph
Quoted 7 lines · Christoph Biedl
Ian Campbell wrote...
Quoted 3 lines
From: Ian Campbell <[email protected]>
Date: Tue, 8 Nov 2011 07:19:06 +0000
Subject: [PATCH] irq: fix build error due to missingirq_pm_syscore_resumeThanks, works for me. Kernel compiles, new kernel is running.
Great, thanks for reporting/testing.
Ian.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Quoted 126 lines · Greg KH
I'm announcing the release of the 2.6.32.47 kernel.
All users of the 2.6.32 series must upgrade.
The updated 2.6.32.y git tree can be found at (NOTE THE ADDRESS CHANGE):
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
linux-2.6.32.y and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=shortlog;h=refs/heads/linux-2.6.32.ythanks,
greg k-h
------------
Documentation/stable_kernel_rules.txt| 4Makefile| 2 arch/arm/mach-davinci/board-da850-evm.c | 28 ++ arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 - arch/mips/alchemy/mtx-1/platform.c | 9 arch/powerpc/kernel/pci_of_scan.c | 2 arch/powerpc/sysdev/mpic.c | 17 - arch/s390/kvm/kvm-s390.c | 14 + arch/sparc/include/asm/sigcontext.h | 14 + arch/sparc/kernel/Makefile | 1 arch/sparc/kernel/pcic.c | 4 arch/sparc/kernel/signal32.c | 184 +++++++++++-------- arch/sparc/kernel/signal_32.c | 172 ++++++++---------- arch/sparc/kernel/signal_64.c | 108 ++++------- arch/sparc/kernel/sigutil.h | 9 arch/sparc/kernel/sigutil_32.c | 120 ++++++++++++ arch/sparc/kernel/sigutil_64.c | 93 +++++++++ arch/um/drivers/ubd_kern.c | 31 +++ arch/x86/include/asm/processor.h | 23 ++ arch/x86/kernel/amd_iommu.c | 2 arch/x86/kernel/kprobes.c | 4 arch/x86/kernel/smpboot.c | 85 --------- arch/x86/kvm/svm.c | 1 arch/x86/kvm/vmx.c | 1 arch/x86/xen/smp.c | 10 + arch/x86/xen/time.c | 4 arch/x86/xen/xen-asm_32.S | 8 block/cfq-iosched.c | 264 +++++++++++++++++++++------- drivers/ata/ahci.c | 12 + drivers/base/sys.c | 6 drivers/block/xen-blkfront.c | 2 drivers/char/hvc_console.c | 8 drivers/char/tpm/tpm.c | 9 drivers/hid/hid-ids.h | 3 drivers/hid/usbhid/hid-quirks.c | 1 drivers/hwmon/w83627ehf.c | 15 + drivers/md/linear.h | 2 drivers/md/md.c | 12 + drivers/media/video/cx23885/cx23885-dvb.c | 2 drivers/media/video/uvc/uvc_driver.c | 2 drivers/media/video/uvc/uvc_video.c | 10 - drivers/media/video/uvc/uvcvideo.h | 2 drivers/net/cnic.c | 4 drivers/net/e1000/e1000_hw.c | 6 drivers/net/e1000e/netdev.c | 2 drivers/net/igb/igb_main.c | 2 drivers/net/igbvf/netdev.c | 2 drivers/net/irda/smsc-ircc2.c | 2 drivers/net/ixgbe/ixgbe_main.c | 2 drivers/net/rionet.c | 4 drivers/net/usb/asix.c | 4 drivers/net/wireless/b43/main.c | 3 drivers/net/wireless/rt2x00/rt2x00usb.c | 14 - drivers/platform/x86/thinkpad_acpi.c | 7 drivers/s390/cio/ccwgroup.c | 42 ++-- drivers/scsi/3w-9xxx.c | 2 drivers/scsi/aacraid/commsup.c | 2 drivers/scsi/ipr.c | 2 drivers/scsi/libiscsi_tcp.c | 14 - drivers/scsi/libsas/sas_expander.c | 14 - drivers/scsi/qla2xxx/qla_init.c | 3 drivers/scsi/qla2xxx/qla_isr.c | 1 drivers/staging/quatech_usb2/quatech_usb2.c | 9 drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/devio.c | 6 drivers/usb/core/quirks.c | 21 ++ drivers/usb/host/ehci-hub.c | 7 drivers/usb/host/fhci-sched.c | 19 +- drivers/usb/host/xhci-mem.c | 22 +- drivers/usb/mon/mon_bin.c | 2 drivers/usb/musb/musb_core.c | 1 drivers/usb/serial/ftdi_sio.c | 25 ++ drivers/usb/serial/ftdi_sio_ids.h | 13 + drivers/usb/serial/pl2303.c | 27 ++ drivers/usb/serial/pl2303.h | 5 drivers/usb/serial/qcserial.c | 2 drivers/usb/storage/transport.c | 34 ++- drivers/video/carminefb.c | 6 drivers/watchdog/mtx-1_wdt.c | 5 drivers/xen/events.c | 2 fs/cifs/cifssmb.c | 3 fs/eventpoll.c | 25 +- fs/ext4/ext4.h | 3 fs/ext4/extents.c | 1 fs/lockd/clntproc.c | 8 fs/nfsd/nfs4proc.c | 2 fs/nfsd/nfs4state.c | 2 fs/proc/base.c | 69 +++++-- fs/proc/kcore.c | 2 fs/splice.c | 3 include/linux/ext2_fs.h | 4 include/linux/ext3_fs.h | 4 include/linux/interrupt.h | 5 include/linux/iocontext.h | 5 include/linux/jiffies.h | 2 include/linux/sunrpc/sched.h | 4 include/net/scm.h | 5 kernel/irq/pm.c | 35 ++- kernel/kmod.c | 4 kernel/time.c | 2 lib/kobject_uevent.c | 2 mm/mmap.c | 20 +- net/9p/client.c | 13 - net/atm/br2684.c | 7 net/bluetooth/l2cap.c | 3 net/bluetooth/rfcomm/sock.c | 1 net/core/scm.c | 10 - net/core/skbuff.c | 8 net/ipv6/ip6_output.c | 2 net/ipv6/ip6_tunnel.c | 4 net/sched/sch_api.c | 14 - net/sunrpc/clnt.c | 3 net/sunrpc/sched.c | 1 net/wireless/nl80211.c | 9 net/wireless/reg.c | 1 net/x25/af_x25.c | 3 sound/pci/hda/patch_cirrus.c | 2 sound/pci/hda/patch_realtek.c | 6 sound/soc/codecs/ak4535.c | 10 - sound/soc/codecs/ak4642.c | 22 +- sound/soc/codecs/wm8940.c | 2 sound/soc/soc-jack.c | 2 122 files changed, 1318 insertions(+), 666 deletions(-)Al Viro (1): deal with races in
/proc/*/{syscall,stack,personality}Alexandre Bounine (1):
drivers/net/rionet.c: fix ethernet address macros for LE platformsAndrew Vasquez (1): qla2xxx: Correct inadvertent loop state transitions during port-update handling.
Aneesh Kumar K.V (1): fs/9p: Fid is not valid after a failed clunk.
Quoted 7 lines
Anton Blanchard (1): ipr: Always initiate hard reset in kdump kernel
Artur Zimmer (1): USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
Axel Lin (2): ASoC: wm8940: Properly set
codec->dapm.bias_level
The above breaks the build I did here. It looks to me that this variable was not introduced before 2.6.38:
CC [M] drivers/input/gameport/fm801-gp.osound/soc/codecs/wm8940.c: In function 'wm8940_set_bias_level':sound/soc/codecs/wm8940.c:476: error: 'struct snd_soc_codec' has no member named 'dapm'
commit ce6120cca2589ede530200c7cfe11ac9f144333c
Author: Liam Girdwood <[email protected]> Date: Fri Nov 5 15:53:46 2010 +0200
ASoC: Decouple DAPM from CODECs
- -Stefan
Quoted 211 lines
ASoC: ak4535: fixup cache register table
Bernd Schubert (1): nfsd4: Remove check for a 32-bit cookie in
nfsd4_readdir()Carsten Otte (1): KVM: s390: check
cpu_idprior to using itChangli Gao (1): splice:
direct_splice_actor()should not use pos in sdDan Carpenter (1): kcore: fix test for end of list
Dan Rosenberg (1): Bluetooth: Prevent buffer overflow in l2cap config request
Daniel Schwierzeck (1): atm: br2684: Fix oops due to
skb->devbeing NULLDavid Henningsson (2): ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name ALSA: HDA: Add new revision for ALC662
David S. Miller (1): sparc: Allow handling signals when stack is corrupted.
Denis Pershin (1): usb: cdc-acm: Owen SI-30 support
Eric Benoit (1): USB: pl2303: add id for SMART device
Eric Dumazet (2): scm: lower
SCM_MAX_FDnet_sched: Fixqdisc_notify()Eric Van Hensbergen (1): net/9p: fix client code to fail more gracefully on protocol error
Filip Palian (1): Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace.
Florian Echtler (1): USB: Serial: Add device ID for Sierra Wireless MC8305
Florian Fainelli (2): Revert "MIPS: MTX-1: Make
au1000_ethprobe all PHY
watchdog: mtx1-wdt: fix build failureGreg Kroah-Hartman (3): Revert "x86, hotplug: Use mwait to offline a processor, fix the legacy case" Revert "usb: musb: restore INDEX register in resume path" Linux 2.6.32.47
Hakan Kvist (1): USB:
ftdi_sio: add PID for Sony Ericsson UrbanHendrik Brueckner (1):
hvc_console: Improve tty/consoleput_charshandlingHerbert Xu (1): ipv6: Add GSO support on forwarding path
Hugh Dickins (1): vm: fix
vm_pgoffwrap in upward expansionIan Campbell (3): sparc: fix array bounds error setting up PCIC NMI trap xen/timer: Missing
IRQF_NO_SUSPENDin timer code broke suspend. genirq: AddIRQF_RESUME_EARLYand resume such IRQs earlierIgor Mammedov (1): xen:
x86_32: do not enable iterrupts when returning from exception in interrupt contextJ. Bruce Fields (1): nfsd4: ignore WANT bits in open downgrade
Jack Wang (1): libsas: set
sas_addressand device type of rphyJames Bottomley (1): 3w-9xxx: fix
iommu_iovaleakJean Delvare (2): hwmon: (w83627ehf) Properly report thermal diode sensors
carminefb: Fix module parameters permissionsJean-Christophe PLAGNIOL-VILLARD (1): USB:
ftdi_sio: add Calao reference board supportJeff Kirsher (1): e1000: Fix driver to be used on PA RISC C8000 workstations
Jeff Layton (1): cifs: fix possible memory corruption in CIFSFindNext
Jeff Moyer (5): cfq: calculate the
seek_meanpercfq_queuenot percfq_io_contextcfq: merge cooperatingcfq_queuescfq: change the meaning of thecfqq_coopflag cfq: break apart merged cfqqs if they stop cooperating
cfq: Don't allow queue merges for queues that have no process referencesJens Axboe (1): cfq-iosched: get rid of the
coop_preemptflagJeremiah Matthey (1): HID: usbhid: Add support for SiGma Micro chip
Jerry Huang (1): QE/FHCI: fixed the CONTROL bug
Jiri Kosina (1): kmod: prevent
kmod_loop_msgoverflow in__request_module()Joerg Roedel (1): iommu/amd: Fix wrong shift direction
Johannes Stezenbach (1): usbmon vs. tcpdump: fix dropped packet count
Josh Boyer (1): Update email address for stable patch submission
Josh Stone (1): x86: Fix compilation bug in kprobes'
twobyte_is_boostableJouni Malinen (1): cfg80211: Fix validation of AKM suites
Kautuk Consul (2): staging:
quatech_usb2: Potential lost wakeup scenario in TIOCMIWAITxhci-mem.c: Check forring->first_seg!= NULLKonrad Rzeszutek Wilk (1): xen/smp: Warn user why they keel over - nosmp or noapic and what to use instead.
Kuninori Morimoto (1): ASoC: ak4642: fixup cache register table
Linus Torvalds (1): vm: fix
vm_pgoffwrap in stack expansionLuben Tuikov (1): USB: storage: Use normalized sense when emulating autosense
Luciano Coelho (1): nl80211: fix overflow in
ssid_lenManoj Iyer (1): thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
Manual Munz (1): b43: Fix beacon problem in ad-hoc mode
Marek Marczykowski (1): xen-blkfront: fix data size for
xenbus_gatherinblkfront_connectMarek Vasut (1): ASIX: Add AX88772B USB ID
Mark Brown (1): ASoC: Fix reporting of partial jack updates
Mark Nelson (1): ahci: Enable SB600 64bit DMA on Asus M3A
Mark Salyzyn (2): libsas: fix failure to revalidate domain for anything but the first expander child. libsas: fix panic when single phy is disabled on a wide port
Matthew Daley (1): x25: Prevent skb overreads when checking call user data
Mauro Carvalho Chehab (1):
tuner_xc2028: Allow selection of the frequency adjustment code for XC3028Michael Chan (1): cnic: Improve
NETDEV_UPevent handlingMichal Schmidt (1): GRO: fix merging a paged skb after non-paged skbs
Michal Sroczynski (1): USB: PL2303: correctly handle baudrates above 115200
Mike Christie (1):
libiscsi_tcp: fix LLD data allocationMilan Broz (1):
kobj_uevent: Ignore if some listeners cannot handle messageMing Lei (1): uvcvideo: Set alternate setting 0 on resume if the bus has been reset
NeilBrown (2): md/linear: avoid corrupting structure while waiting for
rcu_freeto complete. md: Fix handling for devices from 2TB to 4TB in 0.90 metadata.Nelson Elhage (1): epoll: fix spurious lockdep warnings
Oliver Neukum (1): USB: add
RESET_RESUMEfor webcams shown to be quirkyPaul Fertser (1): plat-mxc:
iomux-v3.h: implicitly enable pull-up/down when that's desiredPeter Huewe (2): TPM: Call
tpm_transmitwith correct size TPM: Zero buffer after copying to userspacePeter Stuge (1): USB:
ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI BoardPhilipp Hahn (1): KVM: x86: Reset
tsc_timestampon TSC writesRajkumar Manoharan (1): wireless: Reset
beacon_foundwhile updating regulatoryRandy Dunlap (1): irda: fix smsc-ircc2 section mismatch warning
Richard Weinberger (1): um: fix ubd cow size
Rigbert Hamisch (1): USB: qcserial: add device ID for "HP un2430 Mobile Broadband Module"
Sebastian Ott (1): ccwgroup: move attributes to attribute group
Serge Hallyn (1): USB:
pid_ns: ensure pid is not freed duringkill_pid_info_as_uidSonny Rao (1): powerpc/pci: Check devices status property when scanning OF tree
Sridhar Samudrala (1): net: Fix IPv6 GSO type checks in Intel ethernet drivers
Stanislaw Gruszka (1): rt2x00: do not drop usb dev reference counter on suspend
Stratos Psomadakis (1): Fix broken backport for IPv6 tunnels
Sudhakar Rajashekhara (1): ARM: davinci: da850 EVM: read mac address from SPI flash
Takashi Iwai (1): ALSA: hda/realtek - Avoid bogus HP-pin assignment
Theodore Ts'o (1): ext2,ext3,ext4: don't inherit
APPEND_FLorIMMUTABLE_FLfor new inodesTrond Myklebust (1): NLM: Don't hang forever on NLM unlock requests
Vasily Averin (1): aacraid: reset should disable MSI interrupt
Venkateswararao Jujjuri (JV) (1): net/9p: Fix the msize calculation.
Quoted 9 lines
Wang Zhi (1): USB: EHCI: Do not rely on
PORT_SUSPENDto stop USB resuming inehci_bus_resume().Yang Li (1): powerpc/mpic: Fix problem that affinity is not updated
Zheng Liu (1): ext4: fix
BUG_ON()inext4_ext_insert_extent()hank (1): time: Change
jiffies_to_clock_t()argument type to unsigned long
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBCgAGBQJOuQb2AAoJEOhnXe7L7s6jSTcQAMxOH5Ep28w6ncqGBfaumZ47 5+C9s7Lp9P5ci64bZjlT76O7/XVH4JLq39K4wwwbTelsuqzVtMnNGfxwZ6VYQwaK VmUBANy96DHr3OFA+hIDzkdl5rp07CER7/Mqb4hAL8p2FPwxUxDLiwxxTQyFHc7Z 2ertwUAIbk1rOXd8gh18rMzeRlaGQVgVpLVh0myuFgG3uPKiDc1p7NOfkOviE1cC geUiK5VqcKsLh10VzON2f1Z4jDz2+H/q/aReEumOL9LZ4o86boSkTQZnPER68Xi4 IDjuXSD7zOJ2RJPwK4tOLGp1Io2FufvsSfsuTAchuoQtRjYwGD/8M7u3ukKAvER1 zSaNCTvImjXQUAgbISZ5w5fKIyqwZPyw+1gMkMAGmhQ/7uUO/BV3i7bR16QBjq3k j3XzfBfTqS48wO3FJWzgxi2PwEnkxV1OEc7m93iZweaJzXyrK5ncvtd1ghf6yD1q IyqTjdXHmDaAchYS8Ktul6MyBDNdBhXzplQCAb03q5ldxcJ4NMKNGNAYB0O2h+kp 90ixHbO93ne/qiFdH+T1XQJqxR4rjmM3+JYVZS3YgS3dpLrgvPq2Z+X1hzjD1ehj GnbpjvyHW3OG+vg5nyljFYut+fTrkBGgHxnhzawaiBC2XrtcEcrwElnMI9lVEr9j Vb3Q1I3VDsUl9fFLF5rO
=iu15
-----END PGP SIGNATURE-----
Quoted 1 line · Greg KH
I'm announcing the release of the 2.6.32.47 kernel.
...
Quoted 2 lines
Yang Li (1):
powerpc/mpic: Fix problem that affinity is not updated
Hi, this one is broken:arch/powerpc/sysdev/mpic.c: In function 'irq_choose_cpu':arch/powerpc/sysdev/mpic.c:574: error: passing argument 1 of '__cpus_equal' from incompatible pointer type
Why the backport of the patch misses the cpus_equal -> cpumask_equal switch?
regards,
Signature · 2 lines
js suse labs
ppc: irq_choose_cpu breaks build [was: Linux 2.6.32.47]
In reply to Greg KHDamn, CCs fixed.
Quoted 1 line · Greg KH
I'm announcing the release of the 2.6.32.47 kernel.
...
Quoted 2 lines
Yang Li (1):
powerpc/mpic: Fix problem that affinity is not updated
Hi, this one is broken:arch/powerpc/sysdev/mpic.c: In function 'irq_choose_cpu':arch/powerpc/sysdev/mpic.c:574: error: passing argument 1 of '__cpus_equal' from incompatible pointer type
Why the backport of the patch misses the cpus_equal -> cpumask_equal switch?
regards,
Signature · 2 lines
js suse labs
Quoted 82 lines · Ian Campbell
Quoted 34 lines · Greg KH
Quoted 33 lines · Christoph Biedl
Greg KH wrote...
Quoted 1 line
I'm announcing the release of the 2.6.32.47 kernel.
Unfortunately this does not build anymore on ARM (Debian armel):
CHK include/linux/version.h SYMLINK include/asm -> include/asm-arm make[1]: `include/asm-arm/mach-types.h' is up to date. CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h GEN .version CHK include/linux/compile.h UPD include/linux/compile.h CC init/version.o LD init/built-in.o LD .tmp_vmlinux1
drivers/built-in.o: In function `sysdev_resume':
ledtrig-default-on.c:(.text+0x2a97c): undefined reference to `irq_pm_syscore_resume'
make: *** [.tmp_vmlinux1] Error 1The most likely culprit is
commit
0f12a6ad9fa3a03f2bcee36c9cb704821e244c40
Author: Ian Campbell<[email protected]>
Date: Mon Oct 3 15:37:00 2011 +0100genirq: Add
IRQF_RESUME_EARLYand resume such IRQs earlieras reverting that commit made the error go away.
Quoted 8 lines
Quoted 4 lines
The .config used is attached. FWIW, the target system is a DockStar.
Sorry for not having checked during the review period, I should have done so.
Not good.
Ian, Konrad, any thoughts as to how to fix this?
Looks like I got the wrong CONFIG symbol for the function, or more importantly the dummy version of it. Sorry about this.
Ian.
8<--------------------------------------------------------------
Quoted 1 line
From
33a64cf4a184b47493ef312b08468aca3361e112Mon Sep 17 00:00:00 2001From: Ian Campbell<[email protected]>
Date: Tue, 8 Nov 2011 07:19:06 +0000
Subject: [PATCH] irq: fix build error due to missingirq_pm_syscore_resume
irq_pm_syscore_resumeis only available iffCONFIG_PM_SLEEP(kernel/irq/pm.ois only built if this is true). Move the definition (and the dummy definition) under that umbrella.Introduced by the backport of upstream
9bab0b7fbaceec47d32db51cd9e59c82fb071f5aas0f12a6ad9fa3a03f2bcee36c9cb704821e244c40.Signed-off-by Ian Campbell<[email protected]>Reported-by Christoph Biedl<[email protected]>Reported-by Antoine Martin<[email protected]>--- include/linux/interrupt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)include/linux/interrupt.h +1
-1@@ -199,16 +199,16 @@ extern void enable_irq(unsigned int irq);#ifdef CONFIG_GENERIC_HARDIRQS extern void suspend_device_irqs (void );extern void resume_device_irqs (void ); -extern void irq_pm_syscore_resume (void );#ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs (void ); +extern void irq_pm_syscore_resume (void );
include/linux/interrupt.h extern void enable_irq(unsigned int irq); · line 213
Quoted 10 lines
include/linux/interrupt.h +1
-1#else static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #else static inline void suspend_device_irqs (void ) { };static inline void resume_device_irqs (void ) { }; -static inline void irq_pm_syscore_resume (void ) { };static inline int check_wakeup_irqs (void ) {return 0 ; }#endif
Hmm, sparc doesn't have generic irqs. So:drivers/base/sys.c: In function 'sysdev_resume':drivers/base/sys.c:478: error: implicit declaration of function 'irq_pm_syscore_resume'
regards,
Signature · 2 lines
js suse labs
Re: ppc: irq_choose_cpu breaks build [was: Linux 2.6.32.47]
In reply to Jiri SlabyQuoted 8 lines · Jiri Slaby
Damn, CCs fixed.
Quoted 1 line · Greg KH
I'm announcing the release of the 2.6.32.47 kernel.
...
Quoted 2 lines
Yang Li (1):
powerpc/mpic: Fix problem that affinity is not updated
Quoted 6 lines
Hi, this one is broken:
arch/powerpc/sysdev/mpic.c: In function 'irq_choose_cpu':arch/powerpc/sysdev/mpic.c:574: error: passing argument 1 of '__cpus_equal' from incompatible pointer typeWhy the backport of the patch misses the
cpus_equal->cpumask_equalswitch?
Ick, I'll go revert this.
thanks for letting me know.
greg k-h
Quoted 90 lines · Jiri Slaby
Quoted 89 lines · Ian Campbell
Quoted 34 lines · Greg KH
Quoted 33 lines · Christoph Biedl
Greg KH wrote...
Quoted 1 line
I'm announcing the release of the 2.6.32.47 kernel.
Unfortunately this does not build anymore on ARM (Debian armel):
CHK
include/linux/version.h
SYMLINKinclude/asm->include/asm-arm
make[1]: `include/asm-arm/mach-types.h' is up to date.CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h GEN .version CHK include/linux/compile.h UPD include/linux/compile.h CC init/version.o LD init/built-in.o LD .tmp_vmlinux1
drivers/built-in.o: In function `sysdev_resume':
ledtrig-default-on.c:(.text+0x2a97c): undefined reference to `irq_pm_syscore_resume'
make: *** [.tmp_vmlinux1] Error 1The most likely culprit is
commit
0f12a6ad9fa3a03f2bcee36c9cb704821e244c40
Author: Ian Campbell<[email protected]>
Date: Mon Oct 3 15:37:00 2011 +0100genirq: Add
IRQF_RESUME_EARLYand resume such IRQs earlieras reverting that commit made the error go away.
Quoted 8 lines
Quoted 4 lines
The .config used is attached. FWIW, the target system is a DockStar.
Sorry for not having checked during the review period, I should have done so.
Not good.
Ian, Konrad, any thoughts as to how to fix this?
Looks like I got the wrong CONFIG symbol for the function, or more importantly the dummy version of it. Sorry about this.
Ian.
8<--------------------------------------------------------------
Quoted 1 line
From
33a64cf4a184b47493ef312b08468aca3361e112Mon Sep 17 00:00:00 2001From: Ian Campbell<[email protected]>
Date: Tue, 8 Nov 2011 07:19:06 +0000
Subject: [PATCH] irq: fix build error due to missingirq_pm_syscore_resume
irq_pm_syscore_resumeis only available iffCONFIG_PM_SLEEP(kernel/irq/pm.ois only built if this is true). Move the definition (and the dummy definition) under that umbrella.Introduced by the backport of upstream
9bab0b7fbaceec47d32db51cd9e59c82fb071f5aas0f12a6ad9fa3a03f2bcee36c9cb704821e244c40.Signed-off-by Ian Campbell<[email protected]>Reported-by Christoph Biedl<[email protected]>Reported-by Antoine Martin<[email protected]>--- include/linux/interrupt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)include/linux/interrupt.h +2
-1@@ -199,16 +199,16 @@ extern void enable_irq(unsigned int irq);#ifdef CONFIG_GENERIC_HARDIRQS extern void suspend_device_irqs (void );extern void resume_device_irqs (void ); -extern void irq_pm_syscore_resume (void );#ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs (void ); +extern void irq_pm_syscore_resume (void );#else static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #else static inline void suspend_device_irqs (void ) { };static inline void resume_device_irqs (void ) { };
Quoted 8 lines
include/linux/interrupt.h extern void enable_irq(unsigned int irq); · line 213
Quoted 3 lines
include/linux/interrupt.h +0
-1-static inline void irq_pm_syscore_resume (void ) { };static inline int check_wakeup_irqs (void ) {return 0 ; }#endif Hmm, sparc doesn't have generic irqs. So:
drivers/base/sys.c: In function 'sysdev_resume':drivers/base/sys.c:478: error: implicit declaration of function 'irq_pm_syscore_resume'
Ugh, what a mess.
Ian, I'm just going to revert your original patch, and the other 2 patches that broke the builds, and do a new .32 release.
Please send me the correct patch that builds on all arches, if you all feel it is still needed.
thanks,
greg k-h
Quoted 146 lines · Stefan Bader
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512Quoted 126 lines · Greg KH
I'm announcing the release of the 2.6.32.47 kernel.
All users of the 2.6.32 series must upgrade.
The updated 2.6.32.y git tree can be found at (NOTE THE ADDRESS CHANGE):
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
linux-2.6.32.y and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=shortlog;h=refs/heads/linux-2.6.32.ythanks,
greg k-h
------------
Documentation/stable_kernel_rules.txt| 4Makefile| 2 arch/arm/mach-davinci/board-da850-evm.c | 28 ++ arch/arm/plat-mxc/include/mach/iomux-v3.h | 10 - arch/mips/alchemy/mtx-1/platform.c | 9 arch/powerpc/kernel/pci_of_scan.c | 2 arch/powerpc/sysdev/mpic.c | 17 - arch/s390/kvm/kvm-s390.c | 14 + arch/sparc/include/asm/sigcontext.h | 14 + arch/sparc/kernel/Makefile | 1 arch/sparc/kernel/pcic.c | 4 arch/sparc/kernel/signal32.c | 184 +++++++++++-------- arch/sparc/kernel/signal_32.c | 172 ++++++++---------- arch/sparc/kernel/signal_64.c | 108 ++++------- arch/sparc/kernel/sigutil.h | 9 arch/sparc/kernel/sigutil_32.c | 120 ++++++++++++ arch/sparc/kernel/sigutil_64.c | 93 +++++++++ arch/um/drivers/ubd_kern.c | 31 +++ arch/x86/include/asm/processor.h | 23 ++ arch/x86/kernel/amd_iommu.c | 2 arch/x86/kernel/kprobes.c | 4 arch/x86/kernel/smpboot.c | 85 --------- arch/x86/kvm/svm.c | 1 arch/x86/kvm/vmx.c | 1 arch/x86/xen/smp.c | 10 + arch/x86/xen/time.c | 4 arch/x86/xen/xen-asm_32.S | 8 block/cfq-iosched.c | 264 +++++++++++++++++++++------- drivers/ata/ahci.c | 12 + drivers/base/sys.c | 6 drivers/block/xen-blkfront.c | 2 drivers/char/hvc_console.c | 8 drivers/char/tpm/tpm.c | 9 drivers/hid/hid-ids.h | 3 drivers/hid/usbhid/hid-quirks.c | 1 drivers/hwmon/w83627ehf.c | 15 + drivers/md/linear.h | 2 drivers/md/md.c | 12 + drivers/media/video/cx23885/cx23885-dvb.c | 2 drivers/media/video/uvc/uvc_driver.c | 2 drivers/media/video/uvc/uvc_video.c | 10 - drivers/media/video/uvc/uvcvideo.h | 2 drivers/net/cnic.c | 4 drivers/net/e1000/e1000_hw.c | 6 drivers/net/e1000e/netdev.c | 2 drivers/net/igb/igb_main.c | 2 drivers/net/igbvf/netdev.c | 2 drivers/net/irda/smsc-ircc2.c | 2 drivers/net/ixgbe/ixgbe_main.c | 2 drivers/net/rionet.c | 4 drivers/net/usb/asix.c | 4 drivers/net/wireless/b43/main.c | 3 drivers/net/wireless/rt2x00/rt2x00usb.c | 14 - drivers/platform/x86/thinkpad_acpi.c | 7 drivers/s390/cio/ccwgroup.c | 42 ++-- drivers/scsi/3w-9xxx.c | 2 drivers/scsi/aacraid/commsup.c | 2 drivers/scsi/ipr.c | 2 drivers/scsi/libiscsi_tcp.c | 14 - drivers/scsi/libsas/sas_expander.c | 14 - drivers/scsi/qla2xxx/qla_init.c | 3 drivers/scsi/qla2xxx/qla_isr.c | 1 drivers/staging/quatech_usb2/quatech_usb2.c | 9 drivers/usb/class/cdc-acm.c | 3 drivers/usb/core/devio.c | 6 drivers/usb/core/quirks.c | 21 ++ drivers/usb/host/ehci-hub.c | 7 drivers/usb/host/fhci-sched.c | 19 +- drivers/usb/host/xhci-mem.c | 22 +- drivers/usb/mon/mon_bin.c | 2 drivers/usb/musb/musb_core.c | 1 drivers/usb/serial/ftdi_sio.c | 25 ++ drivers/usb/serial/ftdi_sio_ids.h | 13 + drivers/usb/serial/pl2303.c | 27 ++ drivers/usb/serial/pl2303.h | 5 drivers/usb/serial/qcserial.c | 2 drivers/usb/storage/transport.c | 34 ++- drivers/video/carminefb.c | 6 drivers/watchdog/mtx-1_wdt.c | 5 drivers/xen/events.c | 2 fs/cifs/cifssmb.c | 3 fs/eventpoll.c | 25 +- fs/ext4/ext4.h | 3 fs/ext4/extents.c | 1 fs/lockd/clntproc.c | 8 fs/nfsd/nfs4proc.c | 2 fs/nfsd/nfs4state.c | 2 fs/proc/base.c | 69 +++++-- fs/proc/kcore.c | 2 fs/splice.c | 3 include/linux/ext2_fs.h | 4 include/linux/ext3_fs.h | 4 include/linux/interrupt.h | 5 include/linux/iocontext.h | 5 include/linux/jiffies.h | 2 include/linux/sunrpc/sched.h | 4 include/net/scm.h | 5 kernel/irq/pm.c | 35 ++- kernel/kmod.c | 4 kernel/time.c | 2 lib/kobject_uevent.c | 2 mm/mmap.c | 20 +- net/9p/client.c | 13 - net/atm/br2684.c | 7 net/bluetooth/l2cap.c | 3 net/bluetooth/rfcomm/sock.c | 1 net/core/scm.c | 10 - net/core/skbuff.c | 8 net/ipv6/ip6_output.c | 2 net/ipv6/ip6_tunnel.c | 4 net/sched/sch_api.c | 14 - net/sunrpc/clnt.c | 3 net/sunrpc/sched.c | 1 net/wireless/nl80211.c | 9 net/wireless/reg.c | 1 net/x25/af_x25.c | 3 sound/pci/hda/patch_cirrus.c | 2 sound/pci/hda/patch_realtek.c | 6 sound/soc/codecs/ak4535.c | 10 - sound/soc/codecs/ak4642.c | 22 +- sound/soc/codecs/wm8940.c | 2 sound/soc/soc-jack.c | 2 122 files changed, 1318 insertions(+), 666 deletions(-)Al Viro (1): deal with races in
/proc/*/{syscall,stack,personality}Alexandre Bounine (1):
drivers/net/rionet.c: fix ethernet address macros for LE platformsAndrew Vasquez (1): qla2xxx: Correct inadvertent loop state transitions during port-update handling.
Aneesh Kumar K.V (1): fs/9p: Fid is not valid after a failed clunk.
Quoted 7 lines
Anton Blanchard (1): ipr: Always initiate hard reset in kdump kernel
Artur Zimmer (1): USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
Axel Lin (2): ASoC: wm8940: Properly set
codec->dapm.bias_levelThe above breaks the build I did here. It looks to me that this variable was not introduced before 2.6.38:
CC [M]
drivers/input/gameport/fm801-gp.osound/soc/codecs/wm8940.c: In function 'wm8940_set_bias_level':sound/soc/codecs/wm8940.c:476: error: 'structsnd_soc_codec' has no member named 'dapm'
Quoted 5 lines
commit
ce6120cca2589ede530200c7cfe11ac9f144333cAuthor: Liam Girdwood <[email protected]> Date: Fri Nov 5 15:53:46 2010 +0200ASoC: Decouple DAPM from CODECs
Now reverted, thanks.
greg k-h
Re: ppc: irq_choose_cpu breaks build [was: Linux 2.6.32.47]
In reply to Jiri SlabyQuoted 8 lines · Jiri Slaby
Damn, CCs fixed.
Quoted 1 line · Greg KH
I'm announcing the release of the 2.6.32.47 kernel.
...
Quoted 2 lines
Yang Li (1):
powerpc/mpic: Fix problem that affinity is not updated
Quoted 6 lines
Hi, this one is broken:
arch/powerpc/sysdev/mpic.c: In function 'irq_choose_cpu':arch/powerpc/sysdev/mpic.c:574: error: passing argument 1 of '__cpus_equal' from incompatible pointer typeWhy the backport of the patch misses the
cpus_equal->cpumask_equalswitch?
Ugh, not good, I'll go revert this, thanks for letting me know.
greg k-h
Quoted 100 lines · Greg KH
Quoted 90 lines · Jiri Slaby
Quoted 89 lines · Ian Campbell
Quoted 34 lines · Greg KH
Quoted 33 lines · Christoph Biedl
Greg KH wrote...
Quoted 1 line
I'm announcing the release of the 2.6.32.47 kernel.
Unfortunately this does not build anymore on ARM (Debian armel):
CHK
include/linux/version.h
SYMLINKinclude/asm->include/asm-arm
make[1]: `include/asm-arm/mach-types.h' is up to date.CHK include/linux/utsrelease.h CALL scripts/checksyscalls.sh CHK include/linux/compile.h GEN .version CHK include/linux/compile.h UPD include/linux/compile.h CC init/version.o LD init/built-in.o LD .tmp_vmlinux1
drivers/built-in.o: In function `sysdev_resume':
ledtrig-default-on.c:(.text+0x2a97c): undefined reference to `irq_pm_syscore_resume'
make: *** [.tmp_vmlinux1] Error 1The most likely culprit is
commit
0f12a6ad9fa3a03f2bcee36c9cb704821e244c40
Author: Ian Campbell<[email protected]>
Date: Mon Oct 3 15:37:00 2011 +0100genirq: Add
IRQF_RESUME_EARLYand resume such IRQs earlieras reverting that commit made the error go away.
Quoted 8 lines
Quoted 4 lines
The .config used is attached. FWIW, the target system is a DockStar.
Sorry for not having checked during the review period, I should have done so.
Not good.
Ian, Konrad, any thoughts as to how to fix this?
Looks like I got the wrong CONFIG symbol for the function, or more importantly the dummy version of it. Sorry about this.
Ian.
8<--------------------------------------------------------------
Quoted 1 line
From
33a64cf4a184b47493ef312b08468aca3361e112Mon Sep 17 00:00:00 2001From: Ian Campbell<[email protected]>
Date: Tue, 8 Nov 2011 07:19:06 +0000
Subject: [PATCH] irq: fix build error due to missingirq_pm_syscore_resume
irq_pm_syscore_resumeis only available iffCONFIG_PM_SLEEP(kernel/irq/pm.ois only built if this is true). Move the definition (and the dummy definition) under that umbrella.Introduced by the backport of upstream
9bab0b7fbaceec47d32db51cd9e59c82fb071f5aas0f12a6ad9fa3a03f2bcee36c9cb704821e244c40.Signed-off-by Ian Campbell<[email protected]>Reported-by Christoph Biedl<[email protected]>Reported-by Antoine Martin<[email protected]>--- include/linux/interrupt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)include/linux/interrupt.h +2
-1@@ -199,16 +199,16 @@ extern void enable_irq(unsigned int irq);#ifdef CONFIG_GENERIC_HARDIRQS extern void suspend_device_irqs (void );extern void resume_device_irqs (void ); -extern void irq_pm_syscore_resume (void );#ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs (void ); +extern void irq_pm_syscore_resume (void );#else static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #else static inline void suspend_device_irqs (void ) { };static inline void resume_device_irqs (void ) { };Quoted 8 lines
include/linux/interrupt.h extern void enable_irq(unsigned int irq); · line 213
Quoted 3 lines
include/linux/interrupt.h +0
-1-static inline void irq_pm_syscore_resume (void ) { };static inline int check_wakeup_irqs (void ) {return 0 ; }#endif Hmm, sparc doesn't have generic irqs. So:
drivers/base/sys.c: In function 'sysdev_resume':drivers/base/sys.c:478: error: implicit declaration of function 'irq_pm_syscore_resume'
Quoted 7 lines
Ugh, what a mess.
Ian, I'm just going to revert your original patch, and the other 2 patches that broke the builds, and do a new .32 release.
Please send me the correct patch that builds on all arches, if you all feel it is still needed.
Sorry about this. I should have just looked at where else check_wakeup_irqs was stubbed out and I'd have gotten this right first time.
I'm pretty sure this is now correct but to make double sure I've tested by building defconfig arm amd64 cris i386 ia64 m68k and s390x. I tried a bunch of other archs too but they failed for other (pre-existing) reasons but with no mention of irq_pm_syscore_resume (I used "make -k" so it'll have built as much as it could).
Sorry again for the mess.
Ian.
8<----------------------------------------
Quoted 1 line
From
e3c2a4ded8a458ad0cd77017175cf1cc804fab1dMon Sep 17 00:00:00 2001
From: Ian Campbell <[email protected]>
Date: Mon, 3 Oct 2011 15:37:00 +0100
Subject: [PATCH] genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
commit 9bab0b7fbaceec47d32db51cd9e59c82fb071f5a upstream
This adds a mechanism to resume selected IRQs during syscore_resume instead of dpm_resume_noirq.
Under Xen we need to resume IRQs associated with IPIs early enough that the resched IPI is unmasked and we can therefore schedule ourselves out of the stop_machine where the suspend/resume takes place.
This issue was introduced by 676dc3cf5bc3 "xen: Use IRQF_FORCE_RESUME".
Back ported to 2.6.32 (which lacks syscore support) by calling the relavant resume function directly from sysdev_resume).
v2: Fixed non-x86 build errors.
--- drivers/base/sys.c | 6 ++++++ drivers/xen/events.c | 2 +- include/linux/interrupt.h | 6 ++++++ kernel/irq/pm.c | 35 ++++++++++++++++++++++++++++------- 4 files changed, 41 insertions(+), 8 deletions(-)
drivers/base/sys.c +6 -0
@@ -471,6 +471,12 @@ int sysdev_resume(void) {struct sysdev_class *cls; +/* +* Called from syscore in mainline but called directly here +* since syscore does not exist in this tree. +*/ +irq_pm_syscore_resume (); +WARN_ONCE (!irqs_disabled (),"Interrupts enabled while resuming system devices\n" );
drivers/xen/events.c +1 -1
@@ -536,7 +536,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi,if (irq <0 )return irq; - irqflags |=IRQF_NO_SUSPEND |IRQF_FORCE_RESUME ; + irqflags |=IRQF_NO_SUSPEND |IRQF_FORCE_RESUME |IRQF_EARLY_RESUME ; retval =request_irq (irq, handler, irqflags, devname, dev_id);if (retval !=0 ) {unbind_from_irq (irq);
include/linux/interrupt.h +6 -0
@@ -54,6 +54,8 @@* irq line disabled until the threaded handler has been run. * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set +* IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device +* resume time. */ #define IRQF_DISABLED 0x00000020#define IRQF_SAMPLE_RANDOM 0x00000040
@@ -66,6 +68,7 @@#define IRQF_ONESHOT 0x00002000#define IRQF_NO_SUSPEND 0x00004000#define IRQF_FORCE_RESUME 0x00008000 +#define IRQF_EARLY_RESUME 0x00020000#define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND)
@@ -198,13 +201,16 @@ extern void suspend_device_irqs(void);extern void resume_device_irqs (void );#ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs (void ); +extern void irq_pm_syscore_resume (void );#else static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #else static inline void suspend_device_irqs (void ) { };static inline void resume_device_irqs (void ) { };static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #if defined(CONFIG_SMP ) && defined(CONFIG_GENERIC_HARDIRQS )
kernel/irq/pm.c +28 -7
@@ -39,25 +39,46 @@ void suspend_device_irqs(void) }EXPORT_SYMBOL_GPL (suspend_device_irqs); -/** -* resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() -* -* Enable all interrupt lines previously disabled by suspend_device_irqs() that -* have the IRQ_SUSPENDED flag set. -*/ -void resume_device_irqs (void ) +static void resume_irqs (bool want_early) {struct irq_desc *desc;int irq;for_each_irq_desc (irq, desc) {unsigned long flags; +bool is_early = desc->action && + desc->action->flags &IRQF_EARLY_RESUME ; + +if (is_early != want_early) +continue ;spin_lock_irqsave (&desc->lock, flags);__enable_irq (desc, irq, true);spin_unlock_irqrestore (&desc->lock, flags); } } + +/** +* irq_pm_syscore_ops - enable interrupt lines early +* +* Enable all interrupt lines with %IRQF_EARLY_RESUME set. +*/ +void irq_pm_syscore_resume (void ) +{ +resume_irqs (true); +} + +/** +* resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() +* +* Enable all non-%IRQF_EARLY_RESUME interrupt lines previously +* disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag +* set as well as those with %IRQF_FORCE_RESUME. +*/ +void resume_device_irqs (void ) +{ +resume_irqs (false); +}EXPORT_SYMBOL_GPL (resume_device_irqs);/**
Signature · 1 line
1.7.2.5
[email protected]
AppliedPatch "genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier" has been added to the 2.6.32-longterm tree
This is a note to let you know that I've just added the patch titled
genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
to the 2.6.32-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
The filename of the patch is:
genirq-add-irqf_resume_early-and-resume-such-irqs-earlier.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.32 longterm tree, please let <[email protected]> know about it.
Quoted 1 line
From [email protected] Fri Nov 18 11:33:31 2011
From: Ian Campbell <[email protected]>
Date: Wed, 9 Nov 2011 08:53:09 +0000
Subject: genirq: Add IRQF_RESUME_EARLY and resume such IRQs earlier
To: Greg KH <[email protected]>
Cc: Jiri Slaby <[email protected]>, Greg KH <[email protected]>, Konrad Rzeszutek Wilk <[email protected]>, Jeremy Fitzhardinge <[email protected]>, Christoph Biedl <[email protected]>, [email protected], [email protected], Jiri Slaby <[email protected]>
Message-ID: <[email protected]>
From: Ian Campbell <[email protected]>
commit 9bab0b7fbaceec47d32db51cd9e59c82fb071f5a upstream
This adds a mechanism to resume selected IRQs during syscore_resume instead of dpm_resume_noirq.
Under Xen we need to resume IRQs associated with IPIs early enough that the resched IPI is unmasked and we can therefore schedule ourselves out of the stop_machine where the suspend/resume takes place.
This issue was introduced by 676dc3cf5bc3 "xen: Use IRQF_FORCE_RESUME".
Back ported to 2.6.32 (which lacks syscore support) by calling the relavant resume function directly from sysdev_resume).
v2: Fixed non-x86 build errors.
--- drivers/base/sys.c | 6 ++++++ drivers/xen/events.c | 2 +- include/linux/interrupt.h | 6 ++++++ kernel/irq/pm.c | 35 ++++++++++++++++++++++++++++------- 4 files changed, 41 insertions(+), 8 deletions(-)
drivers/base/sys.c +6 -0
@@ -471,6 +471,12 @@ int sysdev_resume(void) {struct sysdev_class *cls; +/* +* Called from syscore in mainline but called directly here +* since syscore does not exist in this tree. +*/ +irq_pm_syscore_resume (); +WARN_ONCE (!irqs_disabled (),"Interrupts enabled while resuming system devices\n" );
drivers/xen/events.c +1 -1
@@ -536,7 +536,7 @@ int bind_ipi_to_irqhandler(enum ipi_vectif (irq <0 )return irq; - irqflags |=IRQF_NO_SUSPEND |IRQF_FORCE_RESUME ; + irqflags |=IRQF_NO_SUSPEND |IRQF_FORCE_RESUME |IRQF_EARLY_RESUME ; retval =request_irq (irq, handler, irqflags, devname, dev_id);if (retval !=0 ) {unbind_from_irq (irq);
include/linux/interrupt.h +6 -0
@@ -54,6 +54,8 @@* irq line disabled until the threaded handler has been run. * IRQF_NO_SUSPEND - Do not disable this IRQ during suspend * IRQF_FORCE_RESUME - Force enable it on resume even if IRQF_NO_SUSPEND is set +* IRQF_EARLY_RESUME - Resume IRQ early during syscore instead of at device +* resume time. */ #define IRQF_DISABLED 0x00000020#define IRQF_SAMPLE_RANDOM 0x00000040
@@ -66,6 +68,7 @@#define IRQF_ONESHOT 0x00002000#define IRQF_NO_SUSPEND 0x00004000#define IRQF_FORCE_RESUME 0x00008000 +#define IRQF_EARLY_RESUME 0x00020000#define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND)
@@ -198,13 +201,16 @@ extern void suspend_device_irqs(void);extern void resume_device_irqs (void );#ifdef CONFIG_PM_SLEEP extern int check_wakeup_irqs (void ); +extern void irq_pm_syscore_resume (void );#else static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #else static inline void suspend_device_irqs (void ) { };static inline void resume_device_irqs (void ) { };static inline int check_wakeup_irqs (void ) {return 0 ; } +static inline void irq_pm_syscore_resume (void ) { };#endif #if defined(CONFIG_SMP ) && defined(CONFIG_GENERIC_HARDIRQS )
kernel/irq/pm.c +28 -7
@@ -39,25 +39,46 @@ void suspend_device_irqs(void) }EXPORT_SYMBOL_GPL (suspend_device_irqs); -/** -* resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() -* -* Enable all interrupt lines previously disabled by suspend_device_irqs() that -* have the IRQ_SUSPENDED flag set. -*/ -void resume_device_irqs (void ) +static void resume_irqs (bool want_early) {struct irq_desc *desc;int irq;for_each_irq_desc (irq, desc) {unsigned long flags; +bool is_early = desc->action && + desc->action->flags &IRQF_EARLY_RESUME ; + +if (is_early != want_early) +continue ;spin_lock_irqsave (&desc->lock, flags);__enable_irq (desc, irq, true);spin_unlock_irqrestore (&desc->lock, flags); } } + +/** +* irq_pm_syscore_ops - enable interrupt lines early +* +* Enable all interrupt lines with %IRQF_EARLY_RESUME set. +*/ +void irq_pm_syscore_resume (void ) +{ +resume_irqs (true); +} + +/** +* resume_device_irqs - enable interrupt lines disabled by suspend_device_irqs() +* +* Enable all non-%IRQF_EARLY_RESUME interrupt lines previously +* disabled by suspend_device_irqs() that have the IRQS_SUSPENDED flag +* set as well as those with %IRQF_FORCE_RESUME. +*/ +void resume_device_irqs (void ) +{ +resume_irqs (false); +}EXPORT_SYMBOL_GPL (resume_device_irqs);/**
Patches currently in longterm-queue-2.6.32 which might be from [email protected] are
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/genirq-add-irqf_resume_early-and-resume-such-irqs-earlier.patch