Linux 2.6.35.8
Subsystems (65)
I'm announcing the release of the 2.6.35.8 kernel.
All users of the 2.6.35 kernel series must upgrade.
There will only be one more .35 kernel released after this one, so you should be using .36 instead.
The updated 2.6.35.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.35.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.35.y.git;a=summarythanks,
greg k-h
------------
Documentation/sound/alsa/HD-Audio-Models.txt | 1 Makefile | 2 arch/arm/Kconfig | 1 arch/arm/mach-vexpress/ct-ca9x4.c | 2 arch/arm/oprofile/common.c | 7 ++ arch/powerpc/kernel/head_64.S | 18 ++++--- arch/um/drivers/ubd_kern.c | 9 ++- arch/x86/include/asm/amd_iommu_proto.h | 6 ++ arch/x86/include/asm/amd_iommu_types.h | 12 ++++ arch/x86/include/asm/pgtable_32.h | 1 arch/x86/include/asm/trampoline.h | 5 +- arch/x86/kernel/Makefile | 2 arch/x86/kernel/amd_iommu.c | 4 + arch/x86/kernel/amd_iommu_init.c | 67 ++++++++++++++++++--------- arch/x86/kernel/apic/io_apic.c | 11 +++- arch/x86/kernel/cpu/common.c | 4 - arch/x86/kernel/cpu/cpu.h | 1 arch/x86/kernel/cpu/intel.c | 1 arch/x86/kernel/cpu/mcheck/mce_amd.c | 9 +-- arch/x86/kernel/head_32.S | 8 ++- arch/x86/kernel/hpet.c | 2 arch/x86/kernel/setup.c | 2 arch/x86/kernel/smpboot.c | 32 +++++------- arch/x86/kernel/trampoline.c | 17 ++++++ arch/x86/kvm/irq.h | 2 arch/x86/kvm/svm.c | 2 arch/x86/mm/srat_64.c | 8 ++- arch/x86/oprofile/nmi_int.c | 1 block/bsg.c | 2 drivers/acpi/acpica/aclocal.h | 1 drivers/acpi/blacklist.c | 16 ++++++ drivers/acpi/bus.c | 14 +---- drivers/acpi/processor_core.c | 7 -- drivers/acpi/sleep.c | 22 ++++++++ drivers/ata/ahci.c | 4 + drivers/ata/ahci.h | 12 ++++ drivers/ata/ahci_platform.c | 6 ++ drivers/ata/libahci.c | 16 +----- drivers/block/virtio_blk.c | 6 ++ drivers/char/agp/intel-agp.c | 1 drivers/char/agp/intel-agp.h | 6 ++ drivers/char/agp/intel-gtt.c | 50 ++++++++++++++++---- drivers/char/virtio_console.c | 17 +++++- drivers/dma/ioat/dma_v2.c | 2 drivers/dma/mv_xor.c | 2 drivers/edac/i7core_edac.c | 1 drivers/firewire/ohci.c | 19 ------- drivers/firewire/ohci.h | 8 --- drivers/gpu/drm/drm_gem.c | 31 +++--------- drivers/gpu/drm/drm_vm.c | 28 +++++++---- drivers/gpu/drm/i915/i915_dma.c | 9 ++- drivers/gpu/drm/i915/i915_gem.c | 31 +++++++++--- drivers/gpu/drm/radeon/evergreen.c | 4 + drivers/gpu/drm/radeon/r600.c | 3 - drivers/gpu/drm/radeon/radeon_atombios.c | 9 +++ drivers/gpu/drm/radeon/radeon_cursor.c | 28 ++++------- drivers/gpu/drm/radeon/radeon_display.c | 2 drivers/hid/hidraw.c | 11 ++++ drivers/hwmon/lis3lv02d.c | 4 - drivers/i2c/busses/i2c-pca-isa.c | 12 +++- drivers/i2c/busses/i2c-pca-platform.c | 11 ++-- drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +- drivers/input/joydev.c | 3 + drivers/input/tablet/wacom_wac.c | 4 + drivers/media/IR/ir-keytable.c | 2 drivers/media/dvb/dvb-usb/dib0700_devices.c | 55 +++++++++++++++++++++- drivers/media/dvb/frontends/dib7000p.c | 2 drivers/media/dvb/frontends/dib7000p.h | 3 + drivers/media/video/cx231xx/Makefile | 1 drivers/media/video/cx231xx/cx231xx-cards.c | 17 ++++-- drivers/media/video/gspca/gspca.c | 1 drivers/media/video/gspca/sn9c20x.c | 3 - drivers/media/video/v4l2-compat-ioctl32.c | 32 ++++++++---- drivers/mfd/wm831x-irq.c | 9 ++- drivers/mmc/core/core.c | 13 +++++ drivers/mmc/host/sdhci-s3c.c | 6 +- drivers/net/atlx/atl1.c | 5 +- drivers/net/b44.c | 4 - drivers/net/r8169.c | 12 ++-- drivers/net/skge.c | 18 ++++++- drivers/pci/quirks.c | 20 ++++++++ drivers/scsi/scsi.c | 4 - drivers/usb/core/file.c | 35 ++++++-------- drivers/usb/core/message.c | 1 drivers/usb/musb/musb_gadget.c | 22 +++++++- drivers/usb/musb/musb_gadget.h | 2 drivers/usb/musb/musb_gadget_ep0.c | 9 +++ fs/exec.c | 14 +++++ fs/ocfs2/symlink.c | 2 fs/proc/task_mmu.c | 3 - fs/reiserfs/ioctl.c | 7 +- fs/xfs/linux-2.6/xfs_sync.c | 16 ++++-- fs/xfs/linux-2.6/xfs_sync.h | 1 fs/xfs/xfs_iget.c | 1 include/drm/drmP.h | 11 ++-- include/drm/drm_pciids.h | 2 include/linux/intel-gtt.h | 20 ++++++++ include/linux/mm.h | 6 ++ include/linux/pci_ids.h | 3 + kernel/hrtimer.c | 13 ++++- kernel/trace/ring_buffer.c | 2 lib/list_sort.c | 2 mm/ksm.c | 6 +- mm/mlock.c | 6 -- net/mac80211/rx.c | 4 - net/rds/page.c | 27 ++-------- net/wireless/wext-priv.c | 2 sound/core/control.c | 5 ++ sound/core/rawmidi.c | 4 + sound/oss/soundcard.c | 4 - sound/pci/hda/patch_analog.c | 1 sound/pci/hda/patch_conexant.c | 20 ++++++++ sound/pci/oxygen/oxygen.c | 4 + sound/pci/rme9652/hdsp.c | 1 sound/pci/rme9652/hdspm.c | 1 virt/kvm/eventfd.c | 3 - virt/kvm/kvm_main.c | 4 + 117 files changed, 773 insertions(+), 343 deletions(-)
Alan Stern (1):
USB: fix bug in initialization of interface minor numbers
Alex Deucher (6):
drm/radeon/kms: fix bad cast/shift in evergreen.c drm/radeon/kms: avivo cursor workaround applies to evergreen as well drm/radeon/kms: fix possible sigbus in evergreen accel code drm/radeon/kms: fix up encoder info messages for DFP6 drm/radeon/kms: fix potential segfault in r600_ioctl_wait_idle drm/radeon/kms: add quirk for MSI K9A2GM motherboard
Amit Shah (1):
virtio: console: Don't block entire guest if host doesn't read data
Antonio Ospite (2):
HID: hidraw, fix a NULL pointer dereference in hidraw_ioctl
HID: hidraw, fix a NULL pointer dereference in hidraw_write
Aristeu Rozanski (1):
Input: wacom - fix pressure in Cintiq 21UX2
Borislav Petkov (1):
x86, AMD, MCE thresholding: Fix the MCi_MISCj iteration order
Catalin Marinas (1):
ARM: 6395/1: VExpress: Set bit 22 in the PL310 (cache controller) AuxCtlr register
Chris Wilson (4):
drm/i915: Prevent module unload to avoid random memory corruption drm/i915: Sanity check pread/pwrite
drm: Prune GEM vma entries
drm: Hold the mutex when dropping the last GEM reference (v2)
Clemens Ladisch (1):
ALSA: rawmidi: fix oops (use after free) when unloading a driver module
Colin Ian King (1):
ACPI: enable repeated PCIEXP wakeup by clearing PCIEXP_WAKE_STS on resume
Dan Carpenter (1):
OSS: soundcard: locking bug in sound_ioctl()
Dan Rosenberg (2):
ALSA: sound/pci/rme9652: prevent reading uninitialized stack memory
ALSA: prevent heap corruption in snd_ctl_new()
Dan Williams (1):
ioat2: fix performance regression
Dave Airlie (1):
drm/radeon: fix PCI ID 5657 to be an RV410
Don Mullis (1):
lib/list_sort: do not pass bad pointers to cmp callback
Erik J. Staab (1):
ALSA: oxygen: fix analog capture on Claro halo cards
FUJITA Tomonori (1):
bsg: fix incorrect device_status value
Frederic Weisbecker (2):
reiserfs: fix dependency inversion between inode and reiserfs mutexes
reiserfs: fix unwanted reiserfs lock recursion
Greg Kroah-Hartman (1):
Linux 2.6.35.8
H. Peter Anvin (2):
x86, cpu: After uncapping CPUID, re-run CPU feature detection
x86-32: Fix dummy trampoline-related inline stubs
Herton Ronaldo Krzesinski (1):
ALSA: hda - add ideapad model for Conexant 5051 codec
Hugh Dickins (2):
ksm: fix bad user data when swapping
x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline
Jacob Pan (1):
x86: detect scattered cpuid features earlier
Jason Wang (1):
V4L/DVB: gspca - main: Fix a crash of some webcams on ARM arch
Jean-François Moine (1):
V4L/DVB: gspca - sn9c20x: Bad transfer size of Bayer images
Jeremy Fitzhardinge (1):
tracing/x86: Don't use mcount in pvclock.c
Jesse Barnes (1):
drm/i915: fix GMCH power reporting
Jiri Olsa (1):
oprofile: Add Support for Intel CPU Family 6 / Model 29
Joel Becker (1):
ocfs2: Don't walk off the end of fast symlinks.
Joerg Roedel (4):
x86/amd-iommu: Set iommu configuration flags in enable-loop x86/amd-iommu: Fix rounding-bug in __unmap_single x86/amd-iommu: Work around S3 BIOS bug
x86-32: Separate 1:1 pagetables from swapper_pg_dir
Johannes Berg (2):
mac80211: fix use-after-free
wext: fix potential private ioctl memory content leak
Johannes Weiner (1):
xfs: properly account for reclaimed inodes
Julia Lawall (1):
drivers/gpu/drm/i915/i915_gem.c: Add missing error handling code
Kenneth Waters (1):
Input: joydev - fix JSIOCSAXMAP ioctl
Len Brown (4):
ACPI: invoke DSDT corruption workaround on all Toshiba Satellite
intel_idle: PCI quirk to prevent Lenovo Ideapad s10-3 boot hang
ACPI: EC: add Vista incompatibility DMI entry for Toshiba Satellite L355
ACPI: delete ZEPTO idle=nomwait DMI quirk
Linus Torvalds (2):
v4l1: fix 32-bit compat microcode loading translation De-pessimize rds_page_copy_user
Luca Tettamanti (1):
atl1: fix resume
Luke Yelavich (1):
ALSA: hda - Add Dell Latitude E6400 model quirk
Marcelo Tosatti (5):
KVM: i8259: fix migration
KVM: x86: Fix SVM VMCB reset
KVM: x86: Move TSC reset out of vmcb_init
KVM: fix irqfd assign/deassign race
KVM: Fix reboot on Intel hosts
Marcin Slusarz (1):
i7core_edac: fix panic in udimm sysfs attributes registration
Marek Szyprowski (1):
mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove
Mark Brown (1):
mfd: Ignore non-GPIO IRQs when setting wm831x IRQ types
Martin K. Petersen (1):
Fix VPD inquiry page wrapper
Matt Evans (1):
powerpc: Initialise paca->kstack before early_setup_secondary
Mauro Carvalho Chehab (2):
V4L/DVB: cx231xx: Avoid an OOPS when card is unknown (card=0) V4L/DVB: Don't identify PV SBTVD Hybrid as a DibCom device
Maxim Levitsky (1):
V4L/DVB: IR: fix keys beeing stuck down forever
Michael Neuling (1):
powerpc: Don't use kernel stack with translation off
Mike Snitzer (1):
virtio-blk: fix request leak.
Ming Lei (1):
usb: musb: gadget: fix kernel panic if using out ep with FIFO_TXRX style
Ohad Ben-Cohen (1):
mmc: sdio: fix SDIO suspend/resume regression
Olivier Grenie (1):
V4L/DVB: dib7770: enable the current mirror
Paul Fertser (1):
b44: fix carrier detection on bind
Peter Korsgaard (1):
ARM: 6400/1: at91: fix arch_gettimeoffset fallout
Rafael J. Wysocki (1):
PM / ACPI: Blacklist systems known to require acpi_sleep=nonvs
Robert Richter (1):
oprofile, ARM: Release resources on failure
Roland McGrath (3):
setup_arg_pages: diagnose excessive argument size
execve: improve interactivity with large arguments
execve: make responsive to SIGKILL with large arguments
Salman Qazi (1):
hrtimer: Preserve timer state in remove_hrtimer()
Sergei Shtylyov (1):
usb: musb: gadget: restart request on clearing endpoint halt
Simon Guinot (1):
dmaengine: fix interrupt clearing for mv_xor
Stanislaw Gruszka (2):
skge: add quirk to limit DMA
r8169: allocate with GFP_KERNEL flag when able to sleep
Stefan Bader (1):
mm: Move vma_stack_continue into mm.h
Stefan Richter (1):
firewire: ohci: fix TI TSB82AA2 regression since 2.6.35
Steve Wise (1):
RDMA/cxgb3: Turn off RX coalescing for iWARP connections
Steven Rostedt (2):
tracing/x86: Don't use mcount in kvmclock.c
ring-buffer: Fix typo of time extends per page
Takashi Iwai (1):
hwmon: (lis3) Fix Oops with NULL platform data
Tejun Heo (2):
ahci: fix module refcount breakage introduced by libahci split
ubd: fix incorrect sector handling during request restart
Thomas Gleixner (2):
x86, hpet: Fix bogus error check in hpet_assign_irq() x86, irq: Plug memory leak in sparse irq
Yegor Yefremov (1):
i2c-pca: Fix waitforcompletion() return value
Yinghai Lu (2):
x86, numa: For each node, register the memory blocks actually used
ACPI: Handle ACPI0007 Device in acpi_early_set_pdc
Zhang Rui (1):
ACPI: Disable Windows Vista compatibility for Toshiba P305D
Zhenyu Wang (1):
agp/intel: Fix cache control for Sandybridge
Documentation/sound/alsa/HD-Audio-Models.txt +1 -0
@@ -282,6 +282,7 @@ Conexant 5051 hp HP Spartan laptop hp-dv6736 HP dv6736 hp-f700 HP Compaq Presario F700 + ideapad Lenovo IdeaPad laptop lenovo-x200 Lenovo X200 laptop toshiba Toshiba Satellite M300
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 35 -EXTRAVERSION = .7 +EXTRAVERSION = .8 NAME = Yokohama # *DOCUMENTATION*
arch/arm/Kconfig +0 -1
@@ -273,7 +273,6 @@ config ARCH_AT91 bool "Atmel AT91" select ARCH_REQUIRE_GPIOLIB select HAVE_CLK - select ARCH_USES_GETTIMEOFFSET help This enables support for systems based on the Atmel AT91RM9200, AT91SAM9 and AT91CAP9 processors.
arch/arm/mach-vexpress/ct-ca9x4.c +1 -1
@@ -225,7 +225,7 @@ static void ct_ca9x4_init(void)int i;#ifdef CONFIG_CACHE_L2X0 -l2x0_init (MMIO_P2V (CT_CA9X4_L2CC ),0x00000000 ,0xfe0fffff ); +l2x0_init (MMIO_P2V (CT_CA9X4_L2CC ),0x00400000 ,0xfe0fffff );#endif clkdev_add_table (lookups,ARRAY_SIZE (lookups));
arch/arm/oprofile/common.c +5 -2
@@ -102,6 +102,7 @@ static int op_create_counter(int cpu, int event)if (IS_ERR (pevent)) { ret =PTR_ERR (pevent); }else if (pevent->state !=PERF_EVENT_STATE_ACTIVE ) { +perf_event_release_kernel (pevent);pr_warning ("oprofile: failed to enable event %d " "on CPU %d\n" , event, cpu); ret = -EBUSY ;
@@ -365,6 +366,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ret =init_driverfs ();if (ret) {kfree (counter_config); + counter_config =NULL ;return ret; }
@@ -402,7 +404,6 @@ void oprofile_arch_exit(void)struct perf_event *event;if (*perf_events) { -exit_driverfs ();for_each_possible_cpu (cpu) {for (id =0 ; id < perf_num_counters; ++id) { event = perf_events[cpu][id];
@@ -413,8 +414,10 @@ void oprofile_arch_exit(void) } } -if (counter_config) +if (counter_config) {kfree (counter_config); +exit_driverfs (); + } }#else int __init oprofile_arch_init (struct oprofile_operations *ops)
arch/powerpc/kernel/head_64.S +12 -6
@@ -572,15 +572,21 @@ __secondary_start: /* Set thread priority to MEDIUM */ HMT_MEDIUM - /* Do early setup for that CPU (stab, slb, hash table pointer) */ - bl .early_setup_secondary - /* Initialize the kernel stack. Just a repeat for iSeries. */ LOAD_REG_ADDR(r3, current_set) sldi r28,r24,3 /* get current_set[cpu#] */ - ldx r1,r3,r28 - addi r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD - std r1,PACAKSAVE(r13) + ldx r14,r3,r28 + addi r14,r14,THREAD_SIZE-STACK_FRAME_OVERHEAD + std r14,PACAKSAVE(r13) + + /* Do early setup for that CPU (stab, slb, hash table pointer) */ + bl .early_setup_secondary + + /* + * setup the new stack pointer, but *don't* use this until + * translation is on. + */ + mr r1, r14 /* Clear backchain so we get nice backtraces */ li r7,0
arch/um/drivers/ubd_kern.c +5 -4
@@ -162,6 +162,7 @@ struct ubd {struct scatterlist sg[MAX_SG ];struct request *request;int start_sg, end_sg; +sector_t rq_pos; };#define DEFAULT_COW { \
@@ -186,6 +187,7 @@ struct ubd { .request = NULL, \ .start_sg = 0, \ .end_sg = 0, \ + .rq_pos = 0, \ }/* Protected by ubd_lock */
@@ -1223,7 +1225,6 @@ static void do_ubd_request(struct request_queue *q) {struct io_thread_req *io_req;struct request *req; -sector_t sector;int n;while (1 ){
@@ -1234,12 +1235,12 @@ static void do_ubd_request(struct request_queue *q)return ; dev->request = req; + dev->rq_pos =blk_rq_pos (req); dev->start_sg =0 ; dev->end_sg =blk_rq_map_sg (q, req, dev->sg); } req = dev->request; - sector =blk_rq_pos (req);while (dev->start_sg < dev->end_sg){struct scatterlist *sg = &dev->sg[dev->start_sg];
@@ -1251,10 +1252,9 @@ static void do_ubd_request(struct request_queue *q)return ; }prepare_request (req, io_req, - (unsigned long long )sector <<9 , + (unsigned long long )dev->rq_pos <<9 , sg->offset, sg->length,sg_page (sg)); - sector += sg->length >>9 ; n =os_write_file (thread_fd, &io_req,sizeof (struct io_thread_req *));if (n !=sizeof (struct io_thread_req *)){
@@ -1267,6 +1267,7 @@ static void do_ubd_request(struct request_queue *q)return ; } + dev->rq_pos += sg->length >>9 ; dev->start_sg++; } dev->end_sg =0 ;
arch/x86/include/asm/amd_iommu_proto.h +6 -0
@@ -38,4 +38,10 @@ static inline void amd_iommu_stats_init(void) { }#endif /* !CONFIG_AMD_IOMMU_STATS */ +static inline bool is_rd890_iommu (struct pci_dev *pdev) +{ +return (pdev->vendor ==PCI_VENDOR_ID_ATI ) && + (pdev->device ==PCI_DEVICE_ID_RD890_IOMMU ); +} +#endif /* _ASM_X86_AMD_IOMMU_PROTO_H */
arch/x86/include/asm/amd_iommu_types.h +12 -0
@@ -368,6 +368,9 @@ struct amd_iommu {/* capabilities of that IOMMU read from ACPI */ u32 cap; +/* flags read from acpi table */ +u8 acpi_flags; +/* * Capability pointer. There could be more than one IOMMU per PCI * device function if there are more than one AMD IOMMU capability
@@ -411,6 +414,15 @@ struct amd_iommu {/* default dma_ops domain for that IOMMU */ struct dma_ops_domain *default_dom; + +/* +* This array is required to work around a potential BIOS bug. +* The BIOS may miss to restore parts of the PCI configuration +* space when the system resumes from S3. The result is that the +* IOMMU does not execute commands anymore which leads to system +* failure. +*/ +u32 cache_cfg[4 ]; };/*
arch/x86/include/asm/pgtable_32.h +1 -0
@@ -26,6 +26,7 @@ struct mm_struct;struct vm_area_struct ;extern pgd_t swapper_pg_dir[1024 ]; +extern pgd_t trampoline_pg_dir[1024 ];static inline void pgtable_cache_init (void ) { }static inline void check_pgt_cache (void ) { }
arch/x86/include/asm/trampoline.h +4 -1
@@ -13,14 +13,17 @@ extern unsigned char *trampoline_base;extern unsigned long init_rsp;extern unsigned long initial_code; +extern unsigned long initial_page_table;extern unsigned long initial_gs;#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)extern unsigned long setup_trampoline (void ); +extern void __init setup_trampoline_page_table (void );extern void __init reserve_trampoline_memory (void );#else -static inline void reserve_trampoline_memory (void ) {}; +static inline void setup_trampoline_page_table (void ) {} +static inline void reserve_trampoline_memory (void ) {}#endif /* CONFIG_X86_TRAMPOLINE */ #endif /* __ASSEMBLY__ */
arch/x86/kernel/Makefile +2 -0
@@ -11,6 +11,8 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_tsc.o = -pg CFLAGS_REMOVE_rtc.o = -pg CFLAGS_REMOVE_paravirt-spinlocks.o = -pg +CFLAGS_REMOVE_pvclock.o = -pg +CFLAGS_REMOVE_kvmclock.o = -pg CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_early_printk.o = -pg endif
arch/x86/kernel/amd_iommu.c +3 -1
@@ -1953,6 +1953,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom, size_t size, int dir) { +dma_addr_t flush_addr;dma_addr_t i, start;unsigned int pages;
@@ -1960,6 +1961,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom, (dma_addr + size > dma_dom->aperture_size)) return; + flush_addr = dma_addr; pages =iommu_num_pages (dma_addr, size,PAGE_SIZE ); dma_addr &=PAGE_MASK ; start = dma_addr;
@@ -1974,7 +1976,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom,dma_ops_free_addresses (dma_dom, dma_addr, pages);if (amd_iommu_unmap_flush || dma_dom->need_flush) { -iommu_flush_pages (&dma_dom->domain, dma_addr, size); +iommu_flush_pages (&dma_dom->domain, flush_addr, size); dma_dom->need_flush = false; } }
arch/x86/kernel/amd_iommu_init.c +45 -22
92 lines not on this page · raw message
arch/x86/kernel/apic/io_apic.c +8 -3
@@ -306,14 +306,19 @@ void arch_init_copy_chip_data(struct irq_desc *old_desc, old_cfg = old_desc->chip_data; -memcpy (cfg, old_cfg,sizeof (struct irq_cfg )); + cfg->vector = old_cfg->vector; + cfg->move_in_progress = old_cfg->move_in_progress; +cpumask_copy (cfg->domain, old_cfg->domain); +cpumask_copy (cfg->old_domain, old_cfg->old_domain);init_copy_irq_2_pin (old_cfg, cfg, node); } -static void free_irq_cfg (struct irq_cfg *old_cfg) +static void free_irq_cfg (struct irq_cfg *cfg) { -kfree (old_cfg); +free_cpumask_var (cfg->domain); +free_cpumask_var (cfg->old_domain); +kfree (cfg); }void arch_free_chip_data (struct irq_desc *old_desc,struct irq_desc *desc)
arch/x86/kernel/cpu/common.c +2 -2
@@ -537,7 +537,7 @@ void __cpuinit cpu_detect(struct cpuinfo_x86 *c) } } -static void __cpuinit get_cpu_cap (struct cpuinfo_x86 *c) +void __cpuinit get_cpu_cap (struct cpuinfo_x86 *c) {u32 tfms, xlvl;u32 ebx;
@@ -576,6 +576,7 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)if (c->extended_cpuid_level >=0x80000007 ) c->x86_power =cpuid_edx (0x80000007 ); +init_scattered_cpuid_features (c); }static void __cpuinit identify_cpu_without_cpuid (struct cpuinfo_x86 *c)
@@ -731,7 +732,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)get_model_name (c);/* Default name */ -init_scattered_cpuid_features (c);detect_nopl (c); }
arch/x86/kernel/cpu/cpu.h +1 -0
@@ -33,5 +33,6 @@ extern const struct cpu_dev *const __x86_cpu_dev_start[], *const __x86_cpu_dev_end[];extern void cpu_detect_cache_sizes (struct cpuinfo_x86 *c); +extern void get_cpu_cap (struct cpuinfo_x86 *c);#endif
arch/x86/kernel/cpu/intel.c +1 -0
@@ -39,6 +39,7 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID ;wrmsrl (MSR_IA32_MISC_ENABLE , misc_enable); c->cpuid_level =cpuid_eax (0 ); +get_cpu_cap (c); } }
arch/x86/kernel/cpu/mcheck/mce_amd.c +3 -6
@@ -141,6 +141,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c) address = (low &MASK_BLKPTR_LO ) >>21 ;if (!address)break ; + address +=MCG_XBLK_ADDR ; }else ++address;
@@ -148,12 +149,8 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)if (rdmsr_safe (address, &low, &high))break ; -if (!(high &MASK_VALID_HI )) { -if (block) -continue ; -else -break ; - } +if (!(high &MASK_VALID_HI )) +continue ;if (!(high &MASK_CNTP_HI ) || (high &MASK_LOCKED_HI ))
arch/x86/kernel/head_32.S +7 -1
@@ -328,7 +328,7 @@ ENTRY(startup_32_smp) /* * Enable paging */ - movl $pa(swapper_pg_dir),%eax + movl pa(initial_page_table), %eax movl %eax,%cr3 /* set the page table pointer.. */ movl %cr0,%eax orl $X86_CR0_PG,%eax
@@ -608,6 +608,8 @@ ignore_int: .align 4 ENTRY(initial_code) .long i386_start_kernel +ENTRY(initial_page_table) + .long pa(swapper_pg_dir) /* * BSS section
@@ -623,6 +625,10 @@ ENTRY(swapper_pg_dir) #endif swapper_pg_fixmap: .fill 1024,4,0 +#ifdef CONFIG_X86_TRAMPOLINE +ENTRY(trampoline_pg_dir) + .fill 1024,4,0 +#endif ENTRY(empty_zero_page) .fill 4096,1,0
arch/x86/kernel/hpet.c +1 -1
@@ -507,7 +507,7 @@ static int hpet_assign_irq(struct hpet_dev *dev) {unsigned int irq; - irq =create_irq (); + irq =create_irq_nr (0 ,-1 );if (!irq)return -EINVAL ;
arch/x86/kernel/setup.c +2 -0
@@ -1008,6 +1008,8 @@ void __init setup_arch(char **cmdline_p)paging_init (); x86_init.paging.pagetable_setup_done (swapper_pg_dir); +setup_trampoline_page_table (); +tboot_probe ();#ifdef CONFIG_X86_64
arch/x86/kernel/smpboot.c +13 -19
@@ -73,7 +73,6 @@#ifdef CONFIG_X86_32 u8 apicid_2_node[MAX_APICID ]; -static int low_mappings;#endif /* State of each CPU */
@@ -300,6 +299,18 @@ notrace static void __cpuinit start_secondary(void *unused)* fragile that we want to limit the things done here to the * most necessary things. */ + +#ifdef CONFIG_X86_32 +/* +* Switch away from the trampoline page-table +* +* Do this before cpu_init() because it needs to access per-cpu +* data which may not be mapped in the trampoline page-table. +*/ +load_cr3 (swapper_pg_dir); +__flush_tlb_all (); +#endif +vmi_bringup ();cpu_init ();preempt_disable ();
@@ -318,12 +329,6 @@ notrace static void __cpuinit start_secondary(void *unused) legacy_pic->chip->unmask (0 ); } -#ifdef CONFIG_X86_32 -while (low_mappings) -cpu_relax (); -__flush_tlb_all (); -#endif -/* This must be done before setting cpu_online_mask */ set_cpu_sibling_map (raw_smp_processor_id ());wmb ();
@@ -773,6 +778,7 @@ do_rest:#ifdef CONFIG_X86_32 /* Stack for startup_32 can be just as for start_secondary onwards */ irq_ctx_init (cpu); + initial_page_table =__pa (&trampoline_pg_dir);#else clear_tsk_thread_flag (c_idle.idle,TIF_FORK ); initial_gs =per_cpu_offset (cpu);
@@ -920,20 +926,8 @@ int __cpuinit native_cpu_up(unsigned int cpu)per_cpu (cpu_state, cpu) =CPU_UP_PREPARE ; -#ifdef CONFIG_X86_32 -/* init low mem mapping */ -clone_pgd_range (swapper_pg_dir, swapper_pg_dir +KERNEL_PGD_BOUNDARY , - min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY)); -flush_tlb_all (); - low_mappings =1 ; - err =do_boot_cpu (apicid, cpu); -zap_low_mappings (false); - low_mappings =0 ; -#else - err =do_boot_cpu (apicid, cpu); -#endif if (err) {pr_debug ("do_boot_cpu failed %d\n" , err);return -EIO ;
arch/x86/kernel/trampoline.c +17 -0
@@ -1,6 +1,7 @@#include <linux/io.h> #include <asm/trampoline.h> +#include <asm/pgtable.h> #include <asm/e820.h> #if defined(CONFIG_X86_64 ) && defined(CONFIG_ACPI_SLEEP )
@@ -37,3 +38,19 @@ unsigned long __trampinit setup_trampoline(void)memcpy (trampoline_base, trampoline_data,TRAMPOLINE_SIZE );return virt_to_phys (trampoline_base); } + +void __init setup_trampoline_page_table (void ) +{ +#ifdef CONFIG_X86_32 +/* Copy kernel address range */ +clone_pgd_range (trampoline_pg_dir +KERNEL_PGD_BOUNDARY , + swapper_pg_dir +KERNEL_PGD_BOUNDARY , +KERNEL_PGD_PTRS ); + +/* Initialize low mappings */ +clone_pgd_range (trampoline_pg_dir, + swapper_pg_dir +KERNEL_PGD_BOUNDARY , + min_t(unsigned long, KERNEL_PGD_PTRS, +KERNEL_PGD_BOUNDARY )); +#endif +}
arch/x86/kvm/irq.h +1 -1
@@ -45,7 +45,6 @@ struct kvm_kpic_state {u8 irr;/* interrupt request register */ u8 imr;/* interrupt mask register */ u8 isr;/* interrupt service register */ -u8 isr_ack;/* interrupt ack detection */ u8 priority_add;/* highest irq priority */ u8 irq_base;u8 read_reg_select;
@@ -58,6 +57,7 @@ struct kvm_kpic_state {u8 init4;/* true if 4 byte init */ u8 elcr;/* PIIX edge/trigger selection */ u8 elcr_mask; +u8 isr_ack;/* interrupt ack detection */ struct kvm_pic *pics_state; };
arch/x86/kvm/svm.c +1 -1
@@ -766,7 +766,6 @@ static void init_vmcb(struct vcpu_svm *svm) control->iopm_base_pa = iopm_base; control->msrpm_base_pa =__pa (svm->msrpm); - control->tsc_offset =0 ; control->int_ctl =V_INTR_MASKING_MASK ;init_seg (&save->es);
@@ -902,6 +901,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) svm->vmcb_pa =page_to_pfn (page) <<PAGE_SHIFT ; svm->asid_generation =0 ;init_vmcb (svm); + svm->vmcb->control.tsc_offset =0 -native_read_tsc ();fx_init (&svm->vcpu); svm->vcpu.arch.apic_base =0xfee00000 |MSR_IA32_APICBASE_ENABLE ;
arch/x86/mm/srat_64.c +5 -3
@@ -420,9 +420,11 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)return -1 ; } -for_each_node_mask (i, nodes_parsed) -e820_register_active_regions (i, nodes[i].start >>PAGE_SHIFT , - nodes[i].end >>PAGE_SHIFT ); +for (i =0 ; i < num_node_memblks; i++) +e820_register_active_regions (memblk_nodeid[i], + node_memblk_range[i].start >>PAGE_SHIFT , + node_memblk_range[i].end >>PAGE_SHIFT ); +/* for out of order entries in SRAT */ sort_node_map ();if (!nodes_cover_memory (nodes)) {
arch/x86/oprofile/nmi_int.c +1 -0
@@ -674,6 +674,7 @@ static int __init ppro_init(char **cpu_type)case 0x0f :case 0x16 :case 0x17 : +case 0x1d : *cpu_type ="i386/core_2" ;break ;case 0x1a :
block/bsg.c +1 -1
@@ -426,7 +426,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,/* * fill in all the output members */ - hdr->device_status =status_byte (rq->errors); + hdr->device_status = rq->errors &0xff ; hdr->transport_status =host_byte (rq->errors); hdr->driver_status =driver_byte (rq->errors); hdr->info =0 ;
drivers/acpi/acpica/aclocal.h +1 -0
@@ -853,6 +853,7 @@ struct acpi_bit_register_info { ACPI_BITMASK_POWER_BUTTON_STATUS | \ ACPI_BITMASK_SLEEP_BUTTON_STATUS | \ ACPI_BITMASK_RT_CLOCK_STATUS | \ + ACPI_BITMASK_PCIEXP_WAKE_DISABLE | \ ACPI_BITMASK_WAKE_STATUS)#define ACPI_BITMASK_TIMER_ENABLE 0x0001
drivers/acpi/blacklist.c +16 -0
@@ -226,6 +226,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { }, }, { + .callback = dmi_disable_osi_vista, + .ident = "Toshiba Satellite L355", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), + DMI_MATCH(DMI_PRODUCT_VERSION, "Satellite L355"), + }, + }, + { .callback = dmi_disable_osi_win7, .ident = "ASUS K50IJ", .matches = {
@@ -233,6 +241,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"), }, }, + { + .callback = dmi_disable_osi_vista, + .ident = "Toshiba P305D", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P305D"), + }, + },/* * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
drivers/acpi/bus.c +3 -11
@@ -80,23 +80,15 @@ static int set_copy_dsdt(const struct dmi_system_id *id)static struct dmi_system_id dsdt_dmi_table[]__initdata = {/* -* Insyde BIOS on some TOSHIBA machines corrupt the DSDT. +* Invoke DSDT corruption work-around on all Toshiba Satellite. * https://bugzilla.kernel.org/show_bug.cgi?id=14679 */ { .callback = set_copy_dsdt, - .ident ="TOSHIBA Satellite A505" , + .ident ="TOSHIBA Satellite" , .matches = {DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"Satellite A505" ), - }, - }, - { - .callback = set_copy_dsdt, - .ident ="TOSHIBA Satellite L505D" , - .matches = { -DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), -DMI_MATCH (DMI_PRODUCT_NAME ,"Satellite L505D" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Satellite" ), }, }, {}
drivers/acpi/processor_core.c +1 -6
@@ -29,12 +29,6 @@ static int set_no_mwait(const struct dmi_system_id *id)static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { { - set_no_mwait,"IFL91 board" , { -DMI_MATCH (DMI_BIOS_VENDOR ,"COMPAL" ), -DMI_MATCH (DMI_SYS_VENDOR ,"ZEPTO" ), -DMI_MATCH (DMI_PRODUCT_VERSION ,"3215W" ), -DMI_MATCH (DMI_BOARD_NAME ,"IFL91" ) },NULL }, - { set_no_mwait,"Extensa 5220" , {DMI_MATCH (DMI_BIOS_VENDOR ,"Phoenix Technologies LTD" ),DMI_MATCH (DMI_SYS_VENDOR ,"Acer" ),
@@ -352,4 +346,5 @@ void __init acpi_early_processor_set_pdc(void)acpi_walk_namespace (ACPI_TYPE_PROCESSOR ,ACPI_ROOT_OBJECT ,ACPI_UINT32_MAX , early_init_pdc,NULL ,NULL ,NULL ); +acpi_get_devices ("ACPI0007" , early_init_pdc,NULL ,NULL ); }
drivers/acpi/sleep.c +22 -0
@@ -362,6 +362,12 @@ static int __init init_old_suspend_ordering(const struct dmi_system_id *d)return 0 ; } +static int __init init_nvs_nosave (const struct dmi_system_id *d) +{ +acpi_nvs_nosave (); +return 0 ; +} +static struct dmi_system_id __initdata acpisleep_dmi_table[] = { { .callback = init_old_suspend_ordering,
@@ -396,6 +402,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"), }, }, + { + .callback = init_nvs_nosave, + .ident = "Sony Vaio VGN-SR11M", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-SR11M"), + }, + }, + { + .callback = init_nvs_nosave, + .ident = "Everex StepNote Series", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Everex Systems, Inc." ), + DMI_MATCH(DMI_PRODUCT_NAME, "Everex StepNote Series"), + }, + }, {}, };#endif /* CONFIG_SUSPEND */
drivers/ata/ahci.c +4 -0
@@ -89,6 +89,10 @@ static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);static int ahci_pci_device_resume (struct pci_dev *pdev);#endif +static struct scsi_host_template ahci_sht = { +AHCI_SHT ("ahci" ), +}; +static struct ata_port_operations ahci_vt8251_ops = { .inherits = &ahci_ops, .hardreset = ahci_vt8251_hardreset,
drivers/ata/ahci.h +11 -1
@@ -297,7 +297,17 @@ struct ahci_host_priv {extern int ahci_ignore_sss; -extern struct scsi_host_template ahci_sht; +extern struct device_attribute *ahci_shost_attrs[]; +extern struct device_attribute *ahci_sdev_attrs[]; + +#define AHCI_SHT (drv_name) \ + ATA_NCQ_SHT(drv_name), \ + .can_queue = AHCI_MAX_CMDS - 1, \ + .sg_tablesize = AHCI_MAX_SG, \ + .dma_boundary = AHCI_DMA_BOUNDARY, \ + .shost_attrs = ahci_shost_attrs, \ + .sdev_attrs = ahci_sdev_attrs +extern struct ata_port_operations ahci_ops; void ahci_save_initial_config(struct device *dev,
drivers/ata/ahci_platform.c +5 -1
@@ -23,6 +23,10 @@#include <linux/ahci_platform.h> #include "ahci.h" +static struct scsi_host_template ahci_platform_sht = { +AHCI_SHT ("ahci_platform" ), +}; +static int __init ahci_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -140,7 +144,7 @@ static int __init ahci_probe(struct platform_device *pdev)ahci_print_info (host,"platform" ); rc =ata_host_activate (host, irq, ahci_interrupt,IRQF_SHARED , - &ahci_sht); + &ahci_platform_sht);if (rc) goto err0;
drivers/ata/libahci.c +4 -12
@@ -121,7 +121,7 @@ static DEVICE_ATTR(ahci_port_cmd, S_IRUGO, ahci_show_port_cmd, NULL); static DEVICE_ATTR(em_buffer, S_IWUSR | S_IRUGO, ahci_read_em_buffer, ahci_store_em_buffer); -static struct device_attribute *ahci_shost_attrs[] = { +struct device_attribute *ahci_shost_attrs[] = { &dev_attr_link_power_management_policy, &dev_attr_em_message_type, &dev_attr_em_message,
@@ -132,22 +132,14 @@ static struct device_attribute *ahci_shost_attrs[] = { &dev_attr_em_buffer,NULL }; +EXPORT_SYMBOL_GPL (ahci_shost_attrs); -static struct device_attribute *ahci_sdev_attrs[] = { +struct device_attribute *ahci_sdev_attrs[] = { &dev_attr_sw_activity, &dev_attr_unload_heads,NULL }; - -struct scsi_host_template ahci_sht = { -ATA_NCQ_SHT ("ahci" ), - .can_queue =AHCI_MAX_CMDS -1 , - .sg_tablesize =AHCI_MAX_SG , - .dma_boundary =AHCI_DMA_BOUNDARY , - .shost_attrs = ahci_shost_attrs, - .sdev_attrs = ahci_sdev_attrs, -}; -EXPORT_SYMBOL_GPL (ahci_sht); +EXPORT_SYMBOL_GPL (ahci_sdev_attrs);struct ata_port_operations ahci_ops = { .inherits = &sata_pmp_port_ops,
drivers/block/virtio_blk.c +5 -1
@@ -203,6 +203,7 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str)struct virtio_blk *vblk = disk->private_data;struct request *req;struct bio *bio; +int err; bio =bio_map_kern (vblk->disk->queue, id_str,VIRTIO_BLK_ID_BYTES ,GFP_KERNEL );
@@ -216,7 +217,10 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) } req->cmd_type =REQ_TYPE_SPECIAL ; -return blk_execute_rq (vblk->disk->queue, vblk->disk, req, false); + err =blk_execute_rq (vblk->disk->queue, vblk->disk, req, false); +blk_put_request (req); + +return err; } static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
drivers/char/agp/intel-agp.c +1 -0
@@ -12,6 +12,7 @@#include <asm/smp.h> #include "agp.h" #include "intel-agp.h" +#include <linux/intel-gtt.h> #include "intel-gtt.c"
drivers/char/agp/intel-agp.h +6 -0
@@ -60,6 +60,12 @@#define I810_PTE_LOCAL 0x00000002#define I810_PTE_VALID 0x00000001#define I830_PTE_SYSTEM_CACHED 0x00000006 +/* GT PTE cache control fields */ +#define GEN6_PTE_UNCACHED 0x00000002 +#define GEN6_PTE_LLC 0x00000004 +#define GEN6_PTE_LLC_MLC 0x00000006 +#define GEN6_PTE_GFDT 0x00000008 +#define I810_SMRAM_MISCC 0x70#define I810_GFX_MEM_WIN_SIZE 0x00010000#define I810_GFX_MEM_WIN_32M 0x00010000
drivers/char/agp/intel-gtt.c +40 -10
86 lines not on this page · raw message
drivers/char/virtio_console.c +14 -3
@@ -459,9 +459,12 @@ static ssize_t send_buf(struct port *port, void *in_buf, size_t in_count,/* * Wait till the host acknowledges it pushed out the data we -* sent. This is done for ports in blocking mode or for data -* from the hvc_console; the tty operations are performed with -* spinlocks held so we can't sleep here. +* sent. This is done for data from the hvc_console; the tty +* operations are performed with spinlocks held so we can't +* sleep here. An alternative would be to copy the data to a +* buffer and relax the spinning requirement. The downside is +* we need to kmalloc a GFP_ATOMIC buffer each time the +* console driver writes something out. */ while (!virtqueue_get_buf (out_vq, &len))cpu_relax ();
@@ -626,6 +629,14 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, goto free_buf; } +/* +* We now ask send_buf() to not spin for generic ports -- we +* can re-use the same code path that non-blocking file +* descriptors take for blocking file descriptors since the +* wait is already done and we're certain the write will go +* through to the host. +*/ + nonblock = true; ret =send_buf (port, buf, count, nonblock);if (nonblock && ret >0 )
drivers/dma/ioat/dma_v2.c +1 -1
@@ -879,7 +879,7 @@ int __devinit ioat2_dma_probe(struct ioatdma_device *device, int dca) dma->device_issue_pending = ioat2_issue_pending; dma->device_alloc_chan_resources = ioat2_alloc_chan_resources; dma->device_free_chan_resources = ioat2_free_chan_resources; - dma->device_tx_status = ioat_tx_status; + dma->device_tx_status = ioat_dma_tx_status; err =ioat_probe (device);if (err)
drivers/dma/mv_xor.c +1 -1
@@ -162,7 +162,7 @@ static int mv_is_err_intr(u32 intr_cause)static void mv_xor_device_clear_eoc_cause (struct mv_xor_chan *chan) { -u32 val = (1 << (1 + (chan->idx *16 ))); +u32 val = ~(1 << (chan->idx *16 ));dev_dbg (chan->device->common.dev,"%s, val 0x%08x\n" , __func__, val);__raw_writel (val,XOR_INTR_CAUSE (chan)); }
drivers/edac/i7core_edac.c +1 -0
@@ -1140,6 +1140,7 @@ static struct mcidev_sysfs_attribute i7core_udimm_counters_attrs[] = {ATTR_COUNTER (0 ),ATTR_COUNTER (1 ),ATTR_COUNTER (2 ), + { .attr = { .name = NULL } } }; static struct mcidev_sysfs_group i7core_udimm_counters = {
drivers/firewire/ohci.c +1 -18
@@ -2439,7 +2439,7 @@ static int __devinit pci_probe(struct pci_dev *dev, const struct pci_device_id *ent) {struct fw_ohci *ohci; -u32 bus_options, max_receive, link_speed, version, link_enh; +u32 bus_options, max_receive, link_speed, version;u64 guid;int i, err, n_ir, n_it;size_t size;
@@ -2492,23 +2492,6 @@ static int __devinit pci_probe(struct pci_dev *dev,if (param_quirks) ohci->quirks = param_quirks; -/* TI OHCI-Lynx and compatible: set recommended configuration bits. */ -if (dev->vendor ==PCI_VENDOR_ID_TI ) { -pci_read_config_dword (dev, PCI_CFG_TI_LinkEnh, &link_enh); - -/* adjust latency of ATx FIFO: use 1.7 KB threshold */ - link_enh &= ~TI_LinkEnh_atx_thresh_mask; - link_enh |= TI_LinkEnh_atx_thresh_1_7K; - -/* use priority arbitration for asynchronous responses */ - link_enh |= TI_LinkEnh_enab_unfair; - -/* required for aPhyEnhanceEnable to work */ - link_enh |= TI_LinkEnh_enab_accel; - -pci_write_config_dword (dev, PCI_CFG_TI_LinkEnh, link_enh); - } -ar_context_init (&ohci->ar_request_ctx, ohci, OHCI1394_AsReqRcvContextControlSet);
drivers/firewire/ohci.h +0 -8
@@ -154,12 +154,4 @@#define OHCI1394_phy_tcode 0xe -/* TI extensions */ - -#define PCI_CFG_TI_LinkEnh 0xf4 -#define TI_LinkEnh_enab_accel 0x00000002 -#define TI_LinkEnh_enab_unfair 0x00000080 -#define TI_LinkEnh_atx_thresh_mask 0x00003000 -#define TI_LinkEnh_atx_thresh_1_7K 0x00001000 -#endif /* _FIREWIRE_OHCI_H */
drivers/gpu/drm/drm_gem.c +8 -23
@@ -451,28 +451,6 @@ drm_gem_object_free(struct kref *kref) }EXPORT_SYMBOL (drm_gem_object_free); -/** -* Called after the last reference to the object has been lost. -* Must be called without holding struct_mutex -* -* Frees the object -*/ -void -drm_gem_object_free_unlocked (struct kref *kref) -{ -struct drm_gem_object *obj = (struct drm_gem_object *) kref; -struct drm_device *dev = obj->dev; - -if (dev->driver->gem_free_object_unlocked !=NULL ) - dev->driver->gem_free_object_unlocked (obj); -else if (dev->driver->gem_free_object !=NULL ) { -mutex_lock (&dev->struct_mutex); - dev->driver->gem_free_object (obj); -mutex_unlock (&dev->struct_mutex); - } -} -EXPORT_SYMBOL (drm_gem_object_free_unlocked); -static void drm_gem_object_ref_bug (struct kref *list_kref) {BUG ();
@@ -517,6 +495,10 @@ void drm_gem_vm_open(struct vm_area_struct *vma)struct drm_gem_object *obj = vma->vm_private_data;drm_gem_object_reference (obj); + +mutex_lock (&obj->dev->struct_mutex); +drm_vm_open_locked (vma); +mutex_unlock (&obj->dev->struct_mutex); }EXPORT_SYMBOL (drm_gem_vm_open);
@@ -524,7 +506,10 @@ void drm_gem_vm_close(struct vm_area_struct *vma) {struct drm_gem_object *obj = vma->vm_private_data; -drm_gem_object_unreference_unlocked (obj); +mutex_lock (&obj->dev->struct_mutex); +drm_vm_close_locked (vma); +drm_gem_object_unreference (obj); +mutex_unlock (&obj->dev->struct_mutex); }EXPORT_SYMBOL (drm_gem_vm_close);
drivers/gpu/drm/drm_vm.c +18 -10
@@ -433,15 +433,7 @@ static void drm_vm_open(struct vm_area_struct *vma)mutex_unlock (&dev->struct_mutex); } -/** -* \c close method for all virtual memory types. -* -* \param vma virtual memory area. -* -* Search the \p vma private data entry in drm_device::vmalist, unlink it, and -* free it. -*/ -static void drm_vm_close (struct vm_area_struct *vma) +void drm_vm_close_locked (struct vm_area_struct *vma) {struct drm_file *priv = vma->vm_file->private_data;struct drm_device *dev = priv->minor->dev;
@@ -451,7 +443,6 @@ static void drm_vm_close(struct vm_area_struct *vma) vma->vm_start, vma->vm_end - vma->vm_start);atomic_dec (&dev->vma_count); -mutex_lock (&dev->struct_mutex);list_for_each_entry_safe (pt, temp, &dev->vmalist, head) {if (pt->vma == vma) {list_del (&pt->head);
@@ -459,6 +450,23 @@ static void drm_vm_close(struct vm_area_struct *vma)break ; } } +} + +/** +* \c close method for all virtual memory types. +* +* \param vma virtual memory area. +* +* Search the \p vma private data entry in drm_device::vmalist, unlink it, and +* free it. +*/ +static void drm_vm_close (struct vm_area_struct *vma) +{ +struct drm_file *priv = vma->vm_file->private_data; +struct drm_device *dev = priv->minor->dev; + +mutex_lock (&dev->struct_mutex); +drm_vm_close_locked (vma);mutex_unlock (&dev->struct_mutex); }
drivers/gpu/drm/i915/i915_dma.c +6 -3
@@ -1778,9 +1778,9 @@ unsigned long i915_chipset_val(struct drm_i915_private *dev_priv) } } -div_u64 (diff, diff1); + diff =div_u64 (diff, diff1); ret = ((m * diff) + c); -div_u64 (ret,10 ); + ret =div_u64 (ret,10 ); dev_priv->last_count1 = total_count; dev_priv->last_time1 = now;
@@ -1849,7 +1849,7 @@ void i915_update_gfx_val(struct drm_i915_private *dev_priv)/* More magic constants... */ diff = diff *1181 ; -div_u64 (diff, diffms *10 ); + diff =div_u64 (diff, diffms *10 ); dev_priv->gfx_power = diff; }
@@ -2222,6 +2222,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) dev_priv->mchdev_lock = &mchdev_lock;spin_unlock (&mchdev_lock); +/* XXX Prevent module unload due to memory corruption bugs. */ +__module_get (THIS_MODULE ); +return 0 ; out_workqueue_free:
drivers/gpu/drm/i915/i915_gem.c +23 -8
@@ -34,6 +34,7 @@#include <linux/slab.h> #include <linux/swap.h> #include <linux/pci.h> +#include <linux/intel-gtt.h> static void i915_gem_object_flush_gpu_write_domain (struct drm_gem_object *obj);static void i915_gem_object_flush_gtt_write_domain (struct drm_gem_object *obj);
@@ -465,8 +466,15 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data,*/ if (args->offset > obj->size || args->size > obj->size || args->offset + args->size > obj->size) { -drm_gem_object_unreference_unlocked (obj); -return -EINVAL ; + ret = -EINVAL ; + goto err; + } + +if (!access_ok (VERIFY_WRITE , + (char __user *)(uintptr_t )args->data_ptr, + args->size)) { + ret = -EFAULT ; + goto err; }if (i915_gem_object_needs_bit17_swizzle (obj)) {
@@ -478,8 +486,8 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, file_priv); } +err:drm_gem_object_unreference_unlocked (obj); -return ret; }
@@ -568,8 +576,6 @@ i915_gem_gtt_pwrite_fast(struct drm_device *dev, struct drm_gem_object *obj, user_data = (char __user *) (uintptr_t ) args->data_ptr; remain = args->size; -if (!access_ok (VERIFY_READ , user_data, remain)) -return -EFAULT ;mutex_lock (&dev->struct_mutex);
@@ -928,8 +934,15 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,*/ if (args->offset > obj->size || args->size > obj->size || args->offset + args->size > obj->size) { -drm_gem_object_unreference_unlocked (obj); -return -EINVAL ; + ret = -EINVAL ; + goto err; + } + +if (!access_ok (VERIFY_READ , + (char __user *)(uintptr_t )args->data_ptr, + args->size)) { + ret = -EFAULT ; + goto err; }/* We can only do the GTT pwrite on untiled buffers, as otherwise
@@ -963,8 +976,8 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,DRM_INFO ("pwrite failed %d\n" , ret);#endif +err:drm_gem_object_unreference_unlocked (obj); -return ret; }
@@ -3367,6 +3380,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, (int ) reloc->offset, reloc->read_domains, reloc->write_domain); +drm_gem_object_unreference (target_obj); +i915_gem_object_unpin (obj);return -EINVAL ; } if (reloc->write_domain & I915_GEM_DOMAIN_CPU ||
drivers/gpu/drm/radeon/evergreen.c +3 -1
@@ -1120,7 +1120,7 @@ static void evergreen_gpu_init(struct radeon_device *rdev)WREG32 (RCU_IND_INDEX ,0x203 ); efuse_straps_3 =RREG32 (RCU_IND_DATA ); - efuse_box_bit_127_124 = (u8)(efuse_straps_3 &0xF0000000 ) >>28 ; + efuse_box_bit_127_124 = (u8)((efuse_straps_3 &0xF0000000 ) >>28 );switch (efuse_box_bit_127_124) {case 0x0 :
@@ -1389,6 +1389,8 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev->mc.mc_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; rdev->mc.real_vram_size =RREG32 (CONFIG_MEMSIZE ) *1024 *1024 ; rdev->mc.visible_vram_size = rdev->mc.aper_size; +/* limit it to the aperture size for now as there is no blit support in 2.6.35/36*/ + rdev->mc.real_vram_size = rdev->mc.visible_vram_size;r600_vram_gtt_location (rdev, &rdev->mc);radeon_update_bandwidth_info (rdev);
drivers/gpu/drm/radeon/r600.c +2 -1
@@ -3522,7 +3522,8 @@ void r600_ioctl_wait_idle(struct radeon_device *rdev, struct radeon_bo *bo)/* r7xx hw bug. write to HDP_DEBUG1 followed by fb read * rather than write to HDP_REG_COHERENCY_FLUSH_CNTL */ -if ((rdev->family >=CHIP_RV770 ) && (rdev->family <=CHIP_RV740 )) { +if ((rdev->family >=CHIP_RV770 ) && (rdev->family <=CHIP_RV740 ) && + rdev->vram_scratch.ptr) {void __iomem *ptr = (void *)rdev->vram_scratch.ptr;u32 tmp;
drivers/gpu/drm/radeon/radeon_atombios.c +9 -0
@@ -226,6 +226,15 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, *connector_type =DRM_MODE_CONNECTOR_DVID ; } +/* MSI K9A2GM V2/V3 board has no HDMI or DVI */ +if ((dev->pdev->device ==0x796e ) && + (dev->pdev->subsystem_vendor ==0x1462 ) && + (dev->pdev->subsystem_device ==0x7302 )) { +if ((supported_device ==ATOM_DEVICE_DFP2_SUPPORT ) || + (supported_device ==ATOM_DEVICE_DFP3_SUPPORT )) +return false; + } +/* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */ if ((dev->pdev->device == 0x7941) && (dev->pdev->subsystem_vendor == 0x147b) &&
drivers/gpu/drm/radeon/radeon_cursor.c +12 -16
@@ -203,6 +203,7 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc);struct radeon_device *rdev = crtc->dev->dev_private;int xorigin =0 , yorigin =0 ; +int w = radeon_crtc->cursor_width;if (x <0 ) xorigin = -x +1 ;
@@ -213,22 +214,7 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,if (yorigin >=CURSOR_HEIGHT ) yorigin =CURSOR_HEIGHT -1 ; -radeon_lock_cursor (crtc, true); -if (ASIC_IS_DCE4 (rdev)) { -/* cursors are offset into the total surface */ - x += crtc->x; - y += crtc->y; -DRM_DEBUG ("x %d y %d c->x %d c->y %d\n" , x, y, crtc->x, crtc->y); - -/* XXX: check if evergreen has the same issues as avivo chips */ -WREG32 (EVERGREEN_CUR_POSITION + radeon_crtc->crtc_offset, - ((xorigin ?0 : x) <<16 ) | - (yorigin ?0 : y)); -WREG32 (EVERGREEN_CUR_HOT_SPOT + radeon_crtc->crtc_offset, (xorigin <<16 ) | yorigin); -WREG32 (EVERGREEN_CUR_SIZE + radeon_crtc->crtc_offset, - ((radeon_crtc->cursor_width -1 ) <<16 ) | (radeon_crtc->cursor_height -1 )); - }else if (ASIC_IS_AVIVO (rdev)) { -int w = radeon_crtc->cursor_width; +if (ASIC_IS_AVIVO (rdev)) {int i =0 ;struct drm_crtc *crtc_p;
@@ -260,7 +246,17 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,if (w <=0 ) w =1 ; } + } +radeon_lock_cursor (crtc, true); +if (ASIC_IS_DCE4 (rdev)) { +WREG32 (EVERGREEN_CUR_POSITION + radeon_crtc->crtc_offset, + ((xorigin ?0 : x) <<16 ) | + (yorigin ?0 : y)); +WREG32 (EVERGREEN_CUR_HOT_SPOT + radeon_crtc->crtc_offset, (xorigin <<16 ) | yorigin); +WREG32 (EVERGREEN_CUR_SIZE + radeon_crtc->crtc_offset, + ((w -1 ) <<16 ) | (radeon_crtc->cursor_height -1 )); + }else if (ASIC_IS_AVIVO (rdev)) {WREG32 (AVIVO_D1CUR_POSITION + radeon_crtc->crtc_offset, ((xorigin ?0 : x) <<16 ) | (yorigin ?0 : y));
drivers/gpu/drm/radeon/radeon_display.c +2 -0
@@ -349,6 +349,8 @@ static void radeon_print_display_setup(struct drm_device *dev)DRM_INFO (" DFP4: %s\n" , encoder_names[radeon_encoder->encoder_id]);if (devices &ATOM_DEVICE_DFP5_SUPPORT )DRM_INFO (" DFP5: %s\n" , encoder_names[radeon_encoder->encoder_id]); +if (devices &ATOM_DEVICE_DFP6_SUPPORT ) +DRM_INFO (" DFP6: %s\n" , encoder_names[radeon_encoder->encoder_id]);if (devices &ATOM_DEVICE_TV1_SUPPORT )DRM_INFO (" TV1: %s\n" , encoder_names[radeon_encoder->encoder_id]);if (devices &ATOM_DEVICE_CV_SUPPORT )
drivers/hid/hidraw.c +11 -0
@@ -111,6 +111,12 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_tint ret =0 ;mutex_lock (&minors_lock); + +if (!hidraw_table[minor]) { + ret = -ENODEV ; + goto out; + } + dev = hidraw_table[minor]->hid;if (!dev->hid_output_raw_report) {
@@ -246,6 +252,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,mutex_lock (&minors_lock); dev = hidraw_table[minor]; +if (!dev) { + ret = -ENODEV ; + goto out; + }switch (cmd) {case HIDIOCGRDESCSIZE :
@@ -319,6 +329,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, ret = -ENOTTY ; } +out:mutex_unlock (&minors_lock);return ret; }
drivers/hwmon/lis3lv02d.c +2 -2
@@ -277,7 +277,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy)wake_up_interruptible (&lis3_dev.misc_wait);kill_fasync (&lis3_dev.async_queue,SIGIO ,POLL_IN ); out: -if (lis3_dev.whoami ==WAI_8B && lis3_dev.idev && +if (lis3_dev.pdata && lis3_dev.whoami ==WAI_8B && lis3_dev.idev && lis3_dev.idev->input->users)return IRQ_WAKE_THREAD ;return IRQ_HANDLED ;
@@ -718,7 +718,7 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)* io-apic is not configurable (and generates a warning) but I keep it * in case of support for other hardware. */ -if (dev->whoami ==WAI_8B ) +if (dev->pdata && dev->whoami ==WAI_8B ) thread_fn = lis302dl_interrupt_thread1_8b;else thread_fn =NULL ;
drivers/i2c/busses/i2c-pca-isa.c +8 -4
@@ -71,8 +71,8 @@ static int pca_isa_readbyte(void *pd, int reg)static int pca_isa_waitforcompletion (void *pd) { -long ret = ~0 ;unsigned long timeout; +long ret;if (irq >-1 ) { ret = wait_event_timeout(pca_wait,
@@ -81,11 +81,15 @@ static int pca_isa_waitforcompletion(void *pd) }else {/* Do polling */ timeout = jiffies + pca_isa_ops.timeout; -while (((pca_isa_readbyte (pd,I2C_PCA_CON ) - &I2C_PCA_CON_SI ) ==0 ) - && (ret =time_before (jiffies, timeout))) +do { + ret =time_before (jiffies, timeout); +if (pca_isa_readbyte (pd,I2C_PCA_CON ) + &I2C_PCA_CON_SI ) +break ;udelay (100 ); + }while (ret); } +return ret >0 ; }
drivers/i2c/busses/i2c-pca-platform.c +7 -4
@@ -80,8 +80,8 @@ static void i2c_pca_pf_writebyte32(void *pd, int reg, int val)static int i2c_pca_pf_waitforcompletion (void *pd) {struct i2c_pca_pf_data *i2c = pd; -long ret = ~0 ;unsigned long timeout; +long ret;if (i2c->irq) { ret = wait_event_timeout(i2c->wait,
@@ -90,10 +90,13 @@ static int i2c_pca_pf_waitforcompletion(void *pd) }else {/* Do polling */ timeout = jiffies + i2c->adap.timeout; -while (((i2c->algo_data.read_byte (i2c,I2C_PCA_CON ) - &I2C_PCA_CON_SI ) ==0 ) - && (ret =time_before (jiffies, timeout))) +do { + ret =time_before (jiffies, timeout); +if (i2c->algo_data.read_byte (i2c,I2C_PCA_CON ) + &I2C_PCA_CON_SI ) +break ;udelay (100 ); + }while (ret); }return ret >0 ;
drivers/infiniband/hw/cxgb3/iwch_cm.c +4 -2
@@ -463,7 +463,8 @@ static int send_connect(struct iwch_ep *ep)V_MSS_IDX (mtu_idx) |V_L2T_IDX (ep->l2t->idx) |V_TX_CHANNEL (ep->l2t->smt_idx); opt0l =V_TOS ((ep->tos >>2 ) &M_TOS ) |V_RCV_BUFSIZ (rcv_win>>10 ); - opt2 =V_FLAVORS_VALID (1 ) |V_CONG_CONTROL_FLAVOR (cong_flavor); + opt2 =F_RX_COALESCE_VALID |V_RX_COALESCE (0 ) |V_FLAVORS_VALID (1 ) | +V_CONG_CONTROL_FLAVOR (cong_flavor); skb->priority =CPL_PRIORITY_SETUP ;set_arp_failure_handler (skb, act_open_req_arp_failure);
@@ -1280,7 +1281,8 @@ static void accept_cr(struct iwch_ep *ep, __be32 peer_ip, struct sk_buff *skb)V_MSS_IDX (mtu_idx) |V_L2T_IDX (ep->l2t->idx) |V_TX_CHANNEL (ep->l2t->smt_idx); opt0l =V_TOS ((ep->tos >>2 ) &M_TOS ) |V_RCV_BUFSIZ (rcv_win>>10 ); - opt2 =V_FLAVORS_VALID (1 ) |V_CONG_CONTROL_FLAVOR (cong_flavor); + opt2 =F_RX_COALESCE_VALID |V_RX_COALESCE (0 ) |V_FLAVORS_VALID (1 ) | +V_CONG_CONTROL_FLAVOR (cong_flavor); rpl =cplhdr (skb); rpl->wr.wr_hi =htonl (V_WR_OP (FW_WROPCODE_FORWARD ));
drivers/input/joydev.c +3 -0
@@ -483,6 +483,9 @@ static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,memcpy (joydev->abspam, abspam, len); +for (i =0 ; i < joydev->nabs; i++) + joydev->absmap[joydev->abspam[i]] = i; + out:kfree (abspam);return retval;
drivers/input/tablet/wacom_wac.c +3 -1
@@ -409,8 +409,10 @@ static void wacom_intuos_general(struct wacom_wac *wacom)/* general pen packet */ if ((data[1 ] &0xb8 ) ==0xa0 ) { t = (data[6 ] <<2 ) | ((data[7 ] >>6 ) &3 ); -if (features->type >=INTUOS4S && features->type <=INTUOS4L ) +if ((features->type >=INTUOS4S && features->type <=INTUOS4L ) || + features->type ==WACOM_21UX2 ) { t = (t <<1 ) | (data[1 ] &1 ); + }input_report_abs (input,ABS_PRESSURE , t);input_report_abs (input,ABS_TILT_X , ((data[7 ] <<1 ) &0x7e ) | (data[8 ] >>7 ));
drivers/media/IR/ir-keytable.c +1 -1
@@ -319,7 +319,7 @@ static void ir_timer_keyup(unsigned long cookie)* a keyup event might follow immediately after the keydown. */ spin_lock_irqsave (&ir->keylock, flags); -if (time_is_after_eq_jiffies (ir->keyup_jiffies)) +if (time_is_before_eq_jiffies (ir->keyup_jiffies))ir_keyup (ir);spin_unlock_irqrestore (&ir->keylock, flags); }
drivers/media/dvb/dvb-usb/dib0700_devices.c +53 -2
73 lines not on this page · raw message
drivers/media/dvb/frontends/dib7000p.c +2 -0
@@ -260,6 +260,8 @@ static void dib7000p_set_adc_state(struct dib7000p_state *state, enum dibx000_ad// dprintk( "908: %x, 909: %x\n", reg_908, reg_909); + reg_908 |= (state->cfg.enable_current_mirror &1 ) <<7 ; +dib7000p_write_word (state,908 , reg_908);dib7000p_write_word (state,909 , reg_909); }
drivers/media/dvb/frontends/dib7000p.h +3 -0
@@ -33,6 +33,9 @@ struct dib7000p_config {int (*agc_control) (struct dvb_frontend *,u8 before);u8 output_mode; + + u8 enable_current_mirror : 1; + };#define DEFAULT_DIB7000P_I2C_ADDRESS 18
drivers/media/video/cx231xx/Makefile +1 -0
@@ -11,4 +11,5 @@ EXTRA_CFLAGS += -Idrivers/media/video EXTRA_CFLAGS += -Idrivers/media/common/tuners EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends +EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-usb
drivers/media/video/cx231xx/cx231xx-cards.c +11 -6
@@ -32,6 +32,7 @@#include <media/v4l2-chip-ident.h> #include <media/cx25840.h> +#include "dvb-usb-ids.h" #include "xc5000.h" #include "cx231xx.h"
@@ -175,6 +176,8 @@ struct usb_device_id cx231xx_id_table[] = { .driver_info = CX231XX_BOARD_CNXT_RDE_250}, {USB_DEVICE(0x0572, 0x58A1), .driver_info = CX231XX_BOARD_CNXT_RDU_250}, + {USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000,0x4fff), + .driver_info = CX231XX_BOARD_UNKNOWN}, {}, };
@@ -226,14 +229,16 @@ void cx231xx_pre_card_setup(struct cx231xx *dev) dev->board.name, dev->model);/* set the direction for GPIO pins */ -cx231xx_set_gpio_direction (dev, dev->board.tuner_gpio->bit,1 ); -cx231xx_set_gpio_value (dev, dev->board.tuner_gpio->bit,1 ); -cx231xx_set_gpio_direction (dev, dev->board.tuner_sif_gpio,1 ); +if (dev->board.tuner_gpio) { +cx231xx_set_gpio_direction (dev, dev->board.tuner_gpio->bit,1 ); +cx231xx_set_gpio_value (dev, dev->board.tuner_gpio->bit,1 ); +cx231xx_set_gpio_direction (dev, dev->board.tuner_sif_gpio,1 ); -/* request some modules if any required */ +/* request some modules if any required */ -/* reset the Tuner */ -cx231xx_gpio_set (dev, dev->board.tuner_gpio); +/* reset the Tuner */ +cx231xx_gpio_set (dev, dev->board.tuner_gpio); + }/* set the mode to Analog mode initially */ cx231xx_set_mode (dev,CX231XX_ANALOG_MODE );
drivers/media/video/gspca/gspca.c +1 -0
@@ -223,6 +223,7 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,usb_rcvintpipe (dev, ep->bEndpointAddress), buffer, buffer_len, int_irq, (void *)gspca_dev, interval); + urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ; gspca_dev->int_urb = urb; ret =usb_submit_urb (urb,GFP_KERNEL );if (ret <0 ) {
drivers/media/video/gspca/sn9c20x.c +1 -2
@@ -2368,8 +2368,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, (data[33 ] <<10 ); avg_lum >>=9 ;atomic_set (&sd->avg_lum, avg_lum); -gspca_frame_add (gspca_dev,LAST_PACKET , - data, len); +gspca_frame_add (gspca_dev,LAST_PACKET ,NULL ,0 );return ; }if (gspca_dev->last_packet_type ==LAST_PACKET ) {
drivers/media/video/v4l2-compat-ioctl32.c +21 -11
@@ -193,17 +193,24 @@ static int put_video_window32(struct video_window *kp, struct video_window32 __ustruct video_code32 {char loadwhat[16 ];/* name or tag of file being passed */ compat_int_t datasize; -unsigned char *data; +compat_uptr_t data; }; -static int get_microcode32 (struct video_code *kp,struct video_code32 __user *up) +static struct video_code __user *get_microcode32 (struct video_code32 *kp) { -if (!access_ok (VERIFY_READ , up,sizeof (struct video_code32 )) || -copy_from_user (kp->loadwhat, up->loadwhat,sizeof (up->loadwhat)) || -get_user (kp->datasize, &up->datasize) || -copy_from_user (kp->data, up->data, up->datasize)) -return -EFAULT ; -return 0 ; +struct video_code __user *up; + + up =compat_alloc_user_space (sizeof (*up)); + +/* +* NOTE! We don't actually care if these fail. If the +* user address is invalid, the native ioctl will do +* the error handling for us +*/ + (void )copy_to_user (up->loadwhat, kp->loadwhat,sizeof (up->loadwhat)); + (void )put_user (kp->datasize, &up->datasize); + (void )put_user (compat_ptr (kp->data), &up->data); +return up; }#define VIDIOCGTUNER32 _IOWR('v', 4, struct video_tuner32)
@@ -744,7 +751,7 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arstruct video_tuner vt;struct video_buffer vb;struct video_window vw; -struct video_code vc; +struct video_code32 vc;struct video_audio va;#endif struct v4l2_format v2f;
@@ -823,8 +830,11 @@ static long do_video_ioctl(struct file *file, unsigned int cmd, unsigned long arbreak ;case VIDIOCSMICROCODE : - err =get_microcode32 (&karg.vc, up); - compatible_arg =0 ; +/* Copy the 32-bit "video_code32" to kernel space */ +if (copy_from_user (&karg.vc, up,sizeof (karg.vc))) +return -EFAULT ; +/* Convert the 32-bit version to a 64-bit version in user space */ + up =get_microcode32 (&karg.vc);break ;case VIDIOCSFREQ :
drivers/mfd/wm831x-irq.c +7 -2
@@ -394,8 +394,13 @@ static int wm831x_irq_set_type(unsigned int irq, unsigned int type) irq = irq - wm831x->irq_base; -if (irq <WM831X_IRQ_GPIO_1 || irq >WM831X_IRQ_GPIO_11 ) -return -EINVAL ; +if (irq <WM831X_IRQ_GPIO_1 || irq >WM831X_IRQ_GPIO_11 ) { +/* Ignore internal-only IRQs */ +if (irq >=0 && irq <WM831X_NUM_IRQS ) +return 0 ; +else +return -EINVAL ; + }switch (type) {case IRQ_TYPE_EDGE_BOTH :
drivers/mmc/core/core.c +13 -0
@@ -1277,6 +1277,19 @@ int mmc_suspend_host(struct mmc_host *host)if (host->bus_ops && !host->bus_dead) {if (host->bus_ops->suspend) err = host->bus_ops->suspend (host); +if (err == -ENOSYS || !host->bus_ops->resume) { +/* +* We simply "remove" the card in this case. +* It will be redetected on resume. +*/ +if (host->bus_ops->remove) + host->bus_ops->remove (host); +mmc_claim_host (host); +mmc_detach_bus (host); +mmc_release_host (host); + host->pm_flags =0 ; + err =0 ; + } }mmc_bus_put (host);
drivers/mmc/host/sdhci-s3c.c +4 -2
@@ -372,8 +372,10 @@ static int __devexit sdhci_s3c_remove(struct platform_device *pdev)sdhci_remove_host (host,1 );for (ptr =0 ; ptr <3 ; ptr++) { -clk_disable (sc->clk_bus[ptr]); -clk_put (sc->clk_bus[ptr]); +if (sc->clk_bus[ptr]) { +clk_disable (sc->clk_bus[ptr]); +clk_put (sc->clk_bus[ptr]); + } }clk_disable (sc->clk_io);clk_put (sc->clk_io);
drivers/net/atlx/atl1.c +3 -2
@@ -2847,10 +2847,11 @@ static int atl1_resume(struct pci_dev *pdev)pci_enable_wake (pdev, PCI_D3cold,0 );atl1_reset_hw (&adapter->hw); - adapter->cmb.cmb->int_stats =0 ; -if (netif_running (netdev)) +if (netif_running (netdev)) { + adapter->cmb.cmb->int_stats =0 ;atl1_up (adapter); + }netif_device_attach (netdev);return 0 ;
drivers/net/b44.c +2 -2
@@ -2168,8 +2168,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev, dev->irq = sdev->irq;SET_ETHTOOL_OPS (dev, &b44_ethtool_ops); -netif_carrier_off (dev); - err =ssb_bus_powerup (sdev->bus,0 );if (err) { dev_err(sdev->dev,
@@ -2209,6 +2207,8 @@ static int __devinit b44_init_one(struct ssb_device *sdev, goto err_out_powerdown; } +netif_carrier_off (dev); +ssb_set_drvdata (sdev, dev);/* Chip reset provides power to the b44 MAC & PCI cores, which
drivers/net/r8169.c +6 -6
@@ -4008,7 +4008,7 @@ static inline void rtl8169_map_to_asic(struct RxDesc *desc, dma_addr_t mapping,static struct sk_buff *rtl8169_alloc_rx_skb (struct pci_dev *pdev,struct net_device *dev,struct RxDesc *desc,int rx_buf_sz, -unsigned int align) +unsigned int align,gfp_t gfp) {struct sk_buff *skb;dma_addr_t mapping;
@@ -4016,7 +4016,7 @@ static struct sk_buff *rtl8169_alloc_rx_skb(struct pci_dev *pdev, pad = align ? align :NET_IP_ALIGN ; - skb =netdev_alloc_skb (dev, rx_buf_sz + pad); + skb =__netdev_alloc_skb (dev, rx_buf_sz + pad, gfp);if (!skb) goto err_out;
@@ -4047,7 +4047,7 @@ static void rtl8169_rx_clear(struct rtl8169_private *tp) }static u32 rtl8169_rx_fill (struct rtl8169_private *tp,struct net_device *dev, -u32 start,u32 end) +u32 start,u32 end,gfp_t gfp) {u32 cur;
@@ -4062,7 +4062,7 @@ static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev, skb =rtl8169_alloc_rx_skb (tp->pci_dev, dev, tp->RxDescArray + i, - tp->rx_buf_sz, tp->align); + tp->rx_buf_sz, tp->align, gfp);if (!skb)break ;
@@ -4090,7 +4090,7 @@ static int rtl8169_init_ring(struct net_device *dev)memset (tp->tx_skb,0x0 ,NUM_TX_DESC *sizeof (struct ring_info ));memset (tp->Rx_skbuff,0x0 ,NUM_RX_DESC *sizeof (struct sk_buff *)); -if (rtl8169_rx_fill (tp, dev,0 ,NUM_RX_DESC ) !=NUM_RX_DESC ) +if (rtl8169_rx_fill (tp, dev,0 ,NUM_RX_DESC ,GFP_KERNEL ) !=NUM_RX_DESC ) goto err_out;rtl8169_mark_as_last_descriptor (tp->RxDescArray +NUM_RX_DESC -1 );
@@ -4591,7 +4591,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, count = cur_rx - tp->cur_rx; tp->cur_rx = cur_rx; - delta =rtl8169_rx_fill (tp, dev, tp->dirty_rx, tp->cur_rx); + delta =rtl8169_rx_fill (tp, dev, tp->dirty_rx, tp->cur_rx,GFP_ATOMIC );if (!delta && count)netif_info (tp, intr, dev,"no Rx buffer allocated\n" ); tp->dirty_rx += delta;
drivers/net/skge.c +17 -1
@@ -43,6 +43,7 @@#include <linux/seq_file.h> #include <linux/mii.h> #include <linux/slab.h> +#include <linux/dmi.h> #include <asm/irq.h> #include "skge.h"
@@ -3868,6 +3869,8 @@ static void __devinit skge_show_addr(struct net_device *dev)netif_info (skge, probe, skge->netdev,"addr %pM\n" , dev->dev_addr); } +static int only_32bit_dma; +static int __devinit skge_probe (struct pci_dev *pdev,const struct pci_device_id *ent) {
@@ -3889,7 +3892,7 @@ static int __devinit skge_probe(struct pci_dev *pdev,pci_set_master (pdev); -if (!pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ))) { +if (!only_32bit_dma && !pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ))) { using_dac =1 ; err =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); }else if (!(err =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 )))) {
@@ -4147,8 +4150,21 @@ static struct pci_driver skge_driver = { .shutdown = skge_shutdown, }; +static struct dmi_system_id skge_32bit_dma_boards[] = { + { + .ident ="Gigabyte nForce boards" , + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"Gigabyte Technology Co" ), +DMI_MATCH (DMI_BOARD_NAME ,"nForce" ), + }, + }, + {} +}; +static int __init skge_init_module (void ) { +if (dmi_check_system (skge_32bit_dma_boards)) + only_32bit_dma =1 ;skge_debug_init ();return pci_register_driver (&skge_driver); }
drivers/pci/quirks.c +20 -0
@@ -150,6 +150,26 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_2, quirk_isa_dDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_NEC ,PCI_DEVICE_ID_NEC_CBUS_3 , quirk_isa_dma_hangs);/* +* Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear +* for some HT machines to use C4 w/o hanging. +*/ +static void __devinit quirk_tigerpoint_bm_sts (struct pci_dev *dev) +{ +u32 pmbase; +u16 pm1a; + +pci_read_config_dword (dev,0x40 , &pmbase); + pmbase = pmbase &0xff80 ; + pm1a =inw (pmbase); + +if (pm1a &0x10 ) { +dev_info (&dev->dev,FW_BUG "TigerPoint LPC.BM_STS cleared\n" ); +outw (0x10 , pmbase); + } +} +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_TGP_LPC , quirk_tigerpoint_bm_sts); + +/* * Chipsets where PCI->PCI transfers vanish or hang */ static void __devinit quirk_nopcipci (struct pci_dev *dev)
drivers/scsi/scsi.c +2 -2
@@ -1046,13 +1046,13 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,/* If the user actually wanted this page, we can skip the rest */ if (page ==0 ) -return -EINVAL ; +return 0 ;for (i =0 ; i <min ((int )buf[3 ], buf_len -4 ); i++)if (buf[i +4 ] == page) goto found; -if (i < buf[3 ] && i > buf_len) +if (i < buf[3 ] && i >= buf_len -4 )/* ran off the end of the buffer, give us benefit of doubt */ goto found;/* The device claims it doesn't support the requested page */
drivers/usb/core/file.c +16 -19
@@ -159,9 +159,9 @@ void usb_major_cleanup(void)int usb_register_dev (struct usb_interface *intf,struct usb_class_driver *class_driver) { -int retval = -EINVAL ; +int retval;int minor_base = class_driver->minor_base; -int minor =0 ; +int minor;char name[20 ];char *temp;
@@ -173,12 +173,17 @@ int usb_register_dev(struct usb_interface *intf,*/ minor_base =0 ;#endif - intf->minor =-1 ; - -dbg ("looking for a minor, starting at %d" , minor_base);if (class_driver->fops ==NULL ) - goto exit; +return -EINVAL ; +if (intf->minor >=0 ) +return -EADDRINUSE ; + + retval =init_usb_class (); +if (retval) +return retval; + +dev_dbg (&intf->dev,"looking for a minor, starting at %d" , minor_base);down_write (&minor_rwsem);for (minor = minor_base; minor <MAX_USB_MINORS ; ++minor) {
@@ -186,20 +191,12 @@ int usb_register_dev(struct usb_interface *intf,continue ; usb_minors[minor] = class_driver->fops; - - retval =0 ; + intf->minor = minor;break ; }up_write (&minor_rwsem); - -if (retval) - goto exit; - - retval =init_usb_class (); -if (retval) - goto exit; - - intf->minor = minor; +if (intf->minor <0 ) +return -EXFULL ;/* create a usb class device for this usb interface */ snprintf (name,sizeof (name), class_driver->name, minor - minor_base);
@@ -213,11 +210,11 @@ int usb_register_dev(struct usb_interface *intf, "%s", temp);if (IS_ERR (intf->usb_dev)) {down_write (&minor_rwsem); - usb_minors[intf->minor] =NULL ; + usb_minors[minor] =NULL ; + intf->minor =-1 ;up_write (&minor_rwsem); retval =PTR_ERR (intf->usb_dev); } -exit:return retval; }EXPORT_SYMBOL_GPL (usb_register_dev);
drivers/usb/core/message.c +1 -0
@@ -1802,6 +1802,7 @@ free_interfaces: intf->dev.groups = usb_interface_groups; intf->dev.dma_mask = dev->dev.dma_mask;INIT_WORK (&intf->reset_ws, __usb_queue_reset_device); + intf->minor =-1 ;device_initialize (&intf->dev); dev_set_name(&intf->dev, "%d-%s:%d.%d", dev->bus->busnum, dev->devpath,
drivers/usb/musb/musb_gadget.c +18 -4
@@ -568,11 +568,19 @@ static void rxstate(struct musb *musb, struct musb_request *req) {const u8 epnum = req->epnum;struct usb_request *request = &req->request; -struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out; +struct musb_ep *musb_ep;void __iomem *epio = musb->endpoints[epnum].regs;unsigned fifo_count =0 ; -u16 len = musb_ep->packet_sz; +u16 len;u16 csr =musb_readw (epio,MUSB_RXCSR ); +struct musb_hw_ep *hw_ep = &musb->endpoints[epnum]; + +if (hw_ep->is_shared_fifo) + musb_ep = &hw_ep->ep_in; +else + musb_ep = &hw_ep->ep_out; + + len = musb_ep->packet_sz;/* We shouldn't get here while DMA is active, but we do... */ if (dma_channel_status (musb_ep->dma) ==MUSB_DMA_STATUS_BUSY ) {
@@ -740,9 +748,15 @@ void musb_g_rx(struct musb *musb, u8 epnum)u16 csr;struct usb_request *request;void __iomem *mbase = musb->mregs; -struct musb_ep *musb_ep = &musb->endpoints[epnum].ep_out; +struct musb_ep *musb_ep;void __iomem *epio = musb->endpoints[epnum].regs;struct dma_channel *dma; +struct musb_hw_ep *hw_ep = &musb->endpoints[epnum]; + +if (hw_ep->is_shared_fifo) + musb_ep = &hw_ep->ep_in; +else + musb_ep = &hw_ep->ep_out;musb_ep_select (mbase, epnum);
@@ -1081,7 +1095,7 @@ struct free_record {/* * Context: controller locked, IRQs blocked. */ -static void musb_ep_restart (struct musb *musb,struct musb_request *req) +void musb_ep_restart (struct musb *musb,struct musb_request *req) { DBG(3, "<== %s request %p len %u on hw_ep%d\n", req->tx ? "TX/IN" : "RX/OUT",
drivers/usb/musb/musb_gadget.h +2 -0
@@ -105,4 +105,6 @@ extern void musb_gadget_cleanup(struct musb *);extern void musb_g_giveback (struct musb_ep *,struct usb_request *,int ); +extern void musb_ep_restart (struct musb *,struct musb_request *); +#endif /* __MUSB_GADGET_H */
drivers/usb/musb/musb_gadget_ep0.c +9 -0
@@ -261,6 +261,7 @@ __acquires(musb->lock) ctrlrequest->wIndex &0x0f ;struct musb_ep *musb_ep;struct musb_hw_ep *ep; +struct musb_request *request;void __iomem *regs;int is_in;u16 csr;
@@ -302,6 +303,14 @@ __acquires(musb->lock)musb_writew (regs,MUSB_RXCSR , csr); } +/* Maybe start the first request in the queue */ + request =to_musb_request ( +next_request (musb_ep)); +if (!musb_ep->busy && request) { +DBG (3 ,"restarting the request\n" ); +musb_ep_restart (musb, request); + } +/* select ep0 again */ musb_ep_select (mbase,0 ); }break ;
fs/exec.c +14 -0
@@ -377,6 +377,9 @@ static int count(char __user * __user * argv, int max) argv++;if (i++ >= max)return -E2BIG ; + +if (fatal_signal_pending (current)) +return -ERESTARTNOHAND ;cond_resched (); } }
@@ -420,6 +423,12 @@ static int copy_strings(int argc, char __user * __user * argv,while (len >0 ) {int offset, bytes_to_copy; +if (fatal_signal_pending (current)) { + ret = -ERESTARTNOHAND ; + goto out; + } +cond_resched (); + offset = pos %PAGE_SIZE ;if (offset ==0 ) offset =PAGE_SIZE ;
@@ -594,6 +603,11 @@ int setup_arg_pages(struct linux_binprm *bprm,#else stack_top =arch_align_stack (stack_top); stack_top =PAGE_ALIGN (stack_top); + +if (unlikely (stack_top < mmap_min_addr) || +unlikely (vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr)) +return -ENOMEM ; + stack_shift = vma->vm_end - stack_top; bprm->p -= stack_shift;
fs/ocfs2/symlink.c +1 -1
@@ -128,7 +128,7 @@ static void *ocfs2_fast_follow_link(struct dentry *dentry, }/* Fast symlinks can't be large */ - len =strlen (target); + len =strnlen (target,ocfs2_fast_symlink_chars (inode->i_sb)); link =kzalloc (len +1 ,GFP_NOFS );if (!link) { status = -ENOMEM ;
fs/proc/task_mmu.c +2 -1
@@ -224,7 +224,8 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)/* We don't show the stack guard page in /proc/maps */ start = vma->vm_start;if (vma->vm_flags &VM_GROWSDOWN ) - start +=PAGE_SIZE ; +if (!vma_stack_continue (vma->vm_prev, vma->vm_start)) + start +=PAGE_SIZE ; seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", start,
fs/reiserfs/ioctl.c +4 -3
@@ -170,6 +170,7 @@ int reiserfs_prepare_write(struct file *f, struct page *page,int reiserfs_unpack (struct inode *inode,struct file *filp) {int retval =0 ; +int depth;int index;struct page *page;struct address_space *mapping;
@@ -188,8 +189,8 @@ int reiserfs_unpack(struct inode *inode, struct file *filp)/* we need to make sure nobody is changing the file size beneath ** us */ -mutex_lock (&inode->i_mutex); -reiserfs_write_lock (inode->i_sb); +reiserfs_mutex_lock_safe (&inode->i_mutex, inode->i_sb); + depth =reiserfs_write_lock_once (inode->i_sb); write_from = inode->i_size & (blocksize -1 );/* if we are on a block boundary, we are already unpacked. */
@@ -224,6 +225,6 @@ int reiserfs_unpack(struct inode *inode, struct file *filp) out:mutex_unlock (&inode->i_mutex); -reiserfs_write_unlock (inode->i_sb); +reiserfs_write_unlock_once (inode->i_sb, depth);return retval; }
fs/xfs/linux-2.6/xfs_sync.c +12 -4
@@ -711,13 +711,10 @@ xfs_inode_set_reclaim_tag( }void -__xfs_inode_clear_reclaim_tag ( -xfs_mount_t *mp, +__xfs_inode_clear_reclaim (xfs_perag_t *pag,xfs_inode_t *ip) { -radix_tree_tag_clear (&pag->pag_ici_root, -XFS_INO_TO_AGINO (mp, ip->i_ino),XFS_ICI_RECLAIM_TAG ); pag->pag_ici_reclaimable--;if (!pag->pag_ici_reclaimable) {/* clear the reclaim tag from the perag radix tree */
@@ -731,6 +728,17 @@ __xfs_inode_clear_reclaim_tag( } } +void +__xfs_inode_clear_reclaim_tag ( +xfs_mount_t *mp, +xfs_perag_t *pag, +xfs_inode_t *ip) +{ +radix_tree_tag_clear (&pag->pag_ici_root, +XFS_INO_TO_AGINO (mp, ip->i_ino),XFS_ICI_RECLAIM_TAG ); +__xfs_inode_clear_reclaim (pag, ip); +} +/* * Inodes in different states need to be treated differently, and the return * value of xfs_iflush is not sufficient to get this right. The following table
fs/xfs/linux-2.6/xfs_sync.h +1 -0
@@ -47,6 +47,7 @@ int xfs_reclaim_inodes(struct xfs_mount *mp, int mode);void xfs_inode_set_reclaim_tag (struct xfs_inode *ip);void __xfs_inode_set_reclaim_tag (struct xfs_perag *pag,struct xfs_inode *ip); +void __xfs_inode_clear_reclaim (struct xfs_perag *pag,struct xfs_inode *ip);void __xfs_inode_clear_reclaim_tag (struct xfs_mount *mp,struct xfs_perag *pag,struct xfs_inode *ip);
fs/xfs/xfs_iget.c +1 -0
@@ -492,6 +492,7 @@ xfs_ireclaim(write_lock (&pag->pag_ici_lock);if (!radix_tree_delete (&pag->pag_ici_root, agino))ASSERT (0 ); +__xfs_inode_clear_reclaim (pag, ip);write_unlock (&pag->pag_ici_lock);xfs_perag_put (pag);
include/drm/drmP.h +7 -4
@@ -802,7 +802,6 @@ struct drm_driver {*/ int (*gem_init_object) (struct drm_gem_object *obj);void (*gem_free_object) (struct drm_gem_object *obj); -void (*gem_free_object_unlocked) (struct drm_gem_object *obj);/* vga arb irq handler */ void (*vgaarb_irq)(struct drm_device *dev,bool state);
@@ -1149,6 +1148,7 @@ extern int drm_release(struct inode *inode, struct file *filp);extern int drm_mmap (struct file *filp,struct vm_area_struct *vma);extern int drm_mmap_locked (struct file *filp,struct vm_area_struct *vma);extern void drm_vm_open_locked (struct vm_area_struct *vma); +extern void drm_vm_close_locked (struct vm_area_struct *vma);extern resource_size_t drm_core_get_map_ofs (struct drm_local_map * map);extern resource_size_t drm_core_get_reg_ofs (struct drm_device *dev);extern unsigned int drm_poll (struct file *filp,struct poll_table_struct *wait);
@@ -1430,7 +1430,6 @@ int drm_gem_init(struct drm_device *dev);void drm_gem_destroy (struct drm_device *dev);void drm_gem_object_release (struct drm_gem_object *obj);void drm_gem_object_free (struct kref *kref); -void drm_gem_object_free_unlocked (struct kref *kref);struct drm_gem_object *drm_gem_object_alloc (struct drm_device *dev,size_t size); int drm_gem_object_init(struct drm_device *dev,
@@ -1456,8 +1455,12 @@ drm_gem_object_unreference(struct drm_gem_object *obj)static inline void drm_gem_object_unreference_unlocked (struct drm_gem_object *obj) { -if (obj !=NULL ) -kref_put (&obj->refcount, drm_gem_object_free_unlocked); +if (obj !=NULL ) { +struct drm_device *dev = obj->dev; +mutex_lock (&dev->struct_mutex); +kref_put (&obj->refcount, drm_gem_object_free); +mutex_unlock (&dev->struct_mutex); + } } int drm_gem_handle_create(struct drm_file *file_priv,
include/drm/drm_pciids.h +1 -1
@@ -85,7 +85,6 @@ {0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \ {0x1002, 0x5462, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \ {0x1002, 0x5464, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_IS_MOBILITY}, \ - {0x1002, 0x5657, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV380|RADEON_NEW_MEMMAP}, \ {0x1002, 0x5548, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R423|RADEON_NEW_MEMMAP}, \ {0x1002, 0x5549, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R423|RADEON_NEW_MEMMAP}, \ {0x1002, 0x554A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R423|RADEON_NEW_MEMMAP}, \
@@ -103,6 +102,7 @@ {0x1002, 0x564F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x5652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x5653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x5657, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV410|RADEON_NEW_MEMMAP}, \ {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP}, \ {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY}, \ {0x1002, 0x5954, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART}, \
include/linux/intel-gtt.h new file +20 -0
@@ -0,0 +1,20 @@ +/* +* Common Intel AGPGART and GTT definitions. +*/ +#ifndef _INTEL_GTT_H +#define _INTEL_GTT_H + +#include <linux/agp_backend.h> + +/* This is for Intel only GTT controls. +* +* Sandybridge: AGP_USER_CACHED_MEMORY default to LLC only +*/ + +#define AGP_USER_CACHED_MEMORY_LLC_MLC (AGP_USER_TYPES + 2) +#define AGP_USER_UNCACHED_MEMORY (AGP_USER_TYPES + 4) + +/* flag for GFDT type */ +#define AGP_USER_CACHED_MEMORY_GFDT (1 << 3) + +#endif
include/linux/mm.h +6 -0
@@ -863,6 +863,12 @@ int set_page_dirty(struct page *page);int set_page_dirty_lock (struct page *page);int clear_page_dirty_for_io (struct page *page); +/* Is the vma a continuation of the stack vma above it? */ +static inline int vma_stack_continue (struct vm_area_struct *vma,unsigned long addr) +{ +return vma && (vma->vm_end == addr) && (vma->vm_flags &VM_GROWSDOWN ); +} +extern unsigned long move_page_tables (struct vm_area_struct *vma,unsigned long old_addr,struct vm_area_struct *new_vma,unsigned long new_addr,unsigned long len);
include/linux/pci_ids.h +3 -0
@@ -393,6 +393,9 @@#define PCI_DEVICE_ID_VLSI_82C147 0x0105#define PCI_DEVICE_ID_VLSI_VAS96011 0x0702 +/* AMD RD890 Chipset */ +#define PCI_DEVICE_ID_RD890_IOMMU 0x5a23 +#define PCI_VENDOR_ID_ADL 0x1005#define PCI_DEVICE_ID_ADL_2301 0x2301
kernel/hrtimer.c +11 -2
@@ -936,6 +936,7 @@ static inline int remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base) { if (hrtimer_is_queued(timer)) { + unsigned long state;int reprogram;/*
@@ -949,8 +950,13 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base)debug_deactivate (timer);timer_stats_hrtimer_clear_start_info (timer); reprogram = base->cpu_base == &__get_cpu_var (hrtimer_bases); -__remove_hrtimer (timer, base,HRTIMER_STATE_INACTIVE , - reprogram); +/* +* We must preserve the CALLBACK state flag here, +* otherwise we could move the timer base in +* switch_hrtimer_base. +*/ + state = timer->state &HRTIMER_STATE_CALLBACK ; +__remove_hrtimer (timer, base, state, reprogram);return 1 ; }return 0 ;
@@ -1237,6 +1243,9 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now)BUG_ON (timer->state !=HRTIMER_STATE_CALLBACK );enqueue_hrtimer (timer, base); } + +WARN_ON_ONCE (!(timer->state &HRTIMER_STATE_CALLBACK )); + timer->state &= ~HRTIMER_STATE_CALLBACK ; }
kernel/trace/ring_buffer.c +1 -1
@@ -405,7 +405,7 @@ static inline int test_time_stamp(u64 delta)#define BUF_MAX_DATA_SIZE (BUF_PAGE_SIZE - (sizeof(u32) * 2))/* Max number of timestamps that can fit on a page */ -#define RB_TIMESTAMPS_PER_PAGE (BUF_PAGE_SIZE / RB_LEN_TIME_STAMP) +#define RB_TIMESTAMPS_PER_PAGE (BUF_PAGE_SIZE / RB_LEN_TIME_EXTEND)int ring_buffer_print_page_header (struct trace_seq *s) {
lib/list_sort.c +1 -1
@@ -70,7 +70,7 @@ static void merge_and_restore_back_links(void *priv,* element comparison is needed, so the client's cmp() * routine can invoke cond_resched() periodically. */ - (*cmp)(priv, tail, tail); + (*cmp)(priv, tail->next, tail->next); tail->next->prev = tail; tail = tail->next;
mm/ksm.c +4 -2
@@ -731,7 +731,7 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page,if (!ptep) goto out; -if (pte_write (*ptep)) { +if (pte_write (*ptep) ||pte_dirty (*ptep)) {pte_t entry; swapped =PageSwapCache (page);
@@ -754,7 +754,9 @@ static int write_protect_page(struct vm_area_struct *vma, struct page *page,set_pte_at (mm, addr, ptep, entry); goto out_unlock; } - entry =pte_wrprotect (entry); +if (pte_dirty (entry)) +set_page_dirty (page); + entry =pte_mkclean (pte_wrprotect (entry));set_pte_at_notify (mm, addr, ptep, entry); } *orig_pte = *ptep;
mm/mlock.c +0 -6
@@ -135,12 +135,6 @@ void munlock_vma_page(struct page *page) } } -/* Is the vma a continuation of the stack vma above it? */ -static inline int vma_stack_continue (struct vm_area_struct *vma,unsigned long addr) -{ -return vma && (vma->vm_end == addr) && (vma->vm_flags &VM_GROWSDOWN ); -} -static inline int stack_guard_page (struct vm_area_struct *vma,unsigned long addr) { return (vma->vm_flags & VM_GROWSDOWN) &&
net/mac80211/rx.c +0 -4
@@ -2156,9 +2156,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx,struct net_device *prev_dev =NULL ;struct ieee80211_rx_status *status =IEEE80211_SKB_RXCB (skb); -if (status->flag &RX_FLAG_INTERNAL_CMTR ) - goto out_free_skb; -if (skb_headroom (skb) <sizeof (*rthdr) &&pskb_expand_head (skb,sizeof (*rthdr),0 ,GFP_ATOMIC )) goto out_free_skb;
@@ -2217,7 +2214,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, }else goto out_free_skb; - status->flag |=RX_FLAG_INTERNAL_CMTR ;return ; out_free_skb:
net/rds/page.c +7 -20
@@ -57,30 +57,17 @@ int rds_page_copy_user(struct page *page, unsigned long offset,unsigned long ret;void *addr; -if (to_user) + addr =kmap (page); +if (to_user) {rds_stats_add (s_copy_to_user, bytes); -else + ret =copy_to_user (ptr, addr + offset, bytes); + }else {rds_stats_add (s_copy_from_user, bytes); - - addr =kmap_atomic (page,KM_USER0 ); -if (to_user) - ret =__copy_to_user_inatomic (ptr, addr + offset, bytes); -else - ret =__copy_from_user_inatomic (addr + offset, ptr, bytes); -kunmap_atomic (addr,KM_USER0 ); - -if (ret) { - addr =kmap (page); -if (to_user) - ret =copy_to_user (ptr, addr + offset, bytes); -else - ret =copy_from_user (addr + offset, ptr, bytes); -kunmap (page); -if (ret) -return -EFAULT ; + ret =copy_from_user (addr + offset, ptr, bytes); } +kunmap (page); -return 0 ; +return ret ? -EFAULT :0 ; }EXPORT_SYMBOL_GPL (rds_page_copy_user);
net/wireless/wext-priv.c +1 -1
@@ -152,7 +152,7 @@ static int ioctl_private_iw_point(struct iw_point *iwp, unsigned int cmd, }else if (!iwp->pointer)return -EFAULT ; - extra =kmalloc (extra_size,GFP_KERNEL ); + extra =kzalloc (extra_size,GFP_KERNEL );if (!extra)return -ENOMEM ;
sound/core/control.c +5 -0
@@ -31,6 +31,7 @@/* max number of user-defined controls */ #define MAX_USER_CONTROLS 32 +#define MAX_CONTROL_COUNT 1028struct snd_kctl_ioctl {struct list_head list;/* list of all ioctls */
@@ -195,6 +196,10 @@ static struct snd_kcontrol *snd_ctl_new(struct snd_kcontrol *control,if (snd_BUG_ON (!control || !control->count))return NULL ; + +if (control->count >MAX_CONTROL_COUNT ) +return NULL ; + kctl =kzalloc (sizeof (*kctl) +sizeof (struct snd_kcontrol_volatile ) * control->count,GFP_KERNEL );if (kctl ==NULL ) {snd_printk (KERN_ERR "Cannot allocate control instance\n" );
sound/core/rawmidi.c +3 -1
@@ -535,13 +535,15 @@ static int snd_rawmidi_release(struct inode *inode, struct file *file) {struct snd_rawmidi_file *rfile;struct snd_rawmidi *rmidi; +struct module *module; rfile = file->private_data; rmidi = rfile->rmidi;rawmidi_release_priv (rfile);kfree (rfile); + module = rmidi->card->module;snd_card_file_remove (rmidi->card, file); -module_put (rmidi->card->module); +module_put (module);return 0 ; }
sound/oss/soundcard.c +2 -2
@@ -389,11 +389,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case SND_DEV_DSP :case SND_DEV_DSP16 :case SND_DEV_AUDIO : -return audio_ioctl (dev, file, cmd, p); + ret =audio_ioctl (dev, file, cmd, p);break ;case SND_DEV_MIDIN : -return MIDIbuf_ioctl (dev, file, cmd, p); + ret =MIDIbuf_ioctl (dev, file, cmd, p);break ; }
sound/pci/hda/patch_analog.c +1 -0
@@ -3641,6 +3641,7 @@ static struct snd_pci_quirk ad1984_cfg_tbl[] = {/* Lenovo Thinkpad T61/X61 */ SND_PCI_QUIRK_VENDOR (0x17aa ,"Lenovo Thinkpad" ,AD1984_THINKPAD ),SND_PCI_QUIRK (0x1028 ,0x0214 ,"Dell T3400" ,AD1984_DELL_DESKTOP ), + SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP), {} };
sound/pci/hda/patch_conexant.c +20 -0
@@ -1633,6 +1633,11 @@ static void cxt5051_update_speaker(struct hda_codec *codec) pinctl = (!spec->hp_present && spec->cur_eapd) ?PIN_OUT :0 ;snd_hda_codec_write (codec,0x1a ,0 ,AC_VERB_SET_PIN_WIDGET_CONTROL , pinctl); +/* on ideapad there is an aditional speaker (subwoofer) to mute */ +if (spec->ideapad) +snd_hda_codec_write (codec,0x1b ,0 , +AC_VERB_SET_PIN_WIDGET_CONTROL , + pinctl); }/* turn on/off EAPD (+ mute HP) as a master switch */
@@ -1889,6 +1894,13 @@ static void cxt5051_init_mic_port(struct hda_codec *codec, hda_nid_t nid,#endif } +static struct hda_verb cxt5051_ideapad_init_verbs[] = { +/* Subwoofer */ + {0x1b ,AC_VERB_SET_PIN_WIDGET_CONTROL ,PIN_OUT }, + {0x1b ,AC_VERB_SET_CONNECT_SEL ,0x00 }, + { }/* end */ +}; +/* initialize jack-sensing, too */ static int cxt5051_init (struct hda_codec *codec) {
@@ -1918,6 +1930,7 @@ enum {CXT5051_LENOVO_X200 ,/* Lenovo X200 laptop, also used for Advanced Mini Dock 250410 */ CXT5051_F700 ,/* HP Compaq Presario F700 */ CXT5051_TOSHIBA ,/* Toshiba M300 & co */ +CXT5051_IDEAPAD ,/* Lenovo IdeaPad Y430 */ CXT5051_MODELS };
@@ -1928,6 +1941,7 @@ static const char *cxt5051_models[CXT5051_MODELS] = { [CXT5051_LENOVO_X200] = "lenovo-x200", [CXT5051_F700] = "hp-700", [CXT5051_TOSHIBA] = "toshiba", + [CXT5051_IDEAPAD] = "ideapad", };static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
@@ -1939,6 +1953,7 @@ static struct snd_pci_quirk cxt5051_cfg_tbl[] = { CXT5051_LAPTOP),SND_PCI_QUIRK (0x14f1 ,0x5051 ,"HP Spartan 1.1" ,CXT5051_HP ),SND_PCI_QUIRK (0x17aa ,0x20f2 ,"Lenovo X200" ,CXT5051_LENOVO_X200 ), + SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo IdeaPad", CXT5051_IDEAPAD), {} };
@@ -2000,6 +2015,11 @@ static int patch_cxt5051(struct hda_codec *codec) spec->mixers[0 ] = cxt5051_toshiba_mixers; spec->auto_mic =AUTO_MIC_PORTB ;break ; +case CXT5051_IDEAPAD : + spec->init_verbs[spec->num_init_verbs++] = + cxt5051_ideapad_init_verbs; + spec->ideapad =1 ; +break ; }return 0 ;
sound/pci/oxygen/oxygen.c +4 -0
@@ -543,6 +543,10 @@ static int __devinit get_oxygen_model(struct oxygen *chip, chip->model.suspend = claro_suspend; chip->model.resume = claro_resume; chip->model.set_adc_params = set_ak5385_params; + chip->model.device_config =PLAYBACK_0_TO_I2S | +PLAYBACK_1_TO_SPDIF | +CAPTURE_0_FROM_I2S_2 | +CAPTURE_1_FROM_SPDIF ;break ; } if (id->driver_data == MODEL_MERIDIAN ||
sound/pci/rme9652/hdsp.c +1 -0
@@ -4609,6 +4609,7 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigneif (err <0 )return err; +memset (&info,0 ,sizeof (info));spin_lock_irqsave (&hdsp->lock, flags); info.pref_sync_ref = (unsigned char )hdsp_pref_sync_ref (hdsp); info.wordclock_sync_check = (unsigned char )hdsp_wc_sync_check (hdsp);
sound/pci/rme9652/hdspm.c +1 -0
@@ -4127,6 +4127,7 @@ static int snd_hdspm_hwdep_ioctl(struct snd_hwdep * hw, struct file *file,case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO : +memset (&info,0 ,sizeof (info));spin_lock_irq (&hdspm->lock); info.pref_sync_ref =hdspm_pref_sync_ref (hdspm); info.wordclock_sync_check =hdspm_wc_sync_check (hdspm);
virt/kvm/eventfd.c +2 -1
@@ -217,7 +217,6 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi) events = file->f_op->poll (file, &irqfd->pt);list_add_tail (&irqfd->list, &kvm->irqfds.items); -spin_unlock_irq (&kvm->irqfds.lock);/* * Check if there was an event already pending on the eventfd
@@ -226,6 +225,8 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)if (events &POLLIN )schedule_work (&irqfd->inject); +spin_unlock_irq (&kvm->irqfds.lock); +/* * do not drop the file until the irqfd is fully initialized, otherwise * we might race against the POLLHUP
virt/kvm/kvm_main.c +3 -1
@@ -1942,10 +1942,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, asmlinkage void kvm_handle_fault_on_reboot(void) { -if (kvm_rebooting) +if (kvm_rebooting) {/* spin while reset goes on */ +local_irq_enable ();while (true) ; + }/* Fault while not rebooting. We want the trace. */ BUG (); }