Linux 3.4.23
Greg KH
maintainerI'm announcing the release of the 3.4.23 kernel.
All users of the 3.4 kernel series must upgrade.
The updated 3.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.4.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=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/Kconfig | 1 arch/arm/mach-dove/include/mach/pm.h | 2 arch/arm/mach-dove/irq.c | 14 + arch/arm/mach-kirkwood/pcie.c | 11 - arch/x86/include/asm/fpu-internal.h | 15 + arch/x86/kernel/smpboot.c | 5 drivers/acpi/processor_driver.c | 1 drivers/edac/i7300_edac.c | 8 drivers/gpu/drm/i915/intel_lvds.c | 16 + drivers/gpu/drm/radeon/evergreen.c | 191 +++++++++++------------ drivers/gpu/drm/radeon/evergreen_reg.h | 2 drivers/gpu/drm/radeon/evergreend.h | 7 drivers/gpu/drm/radeon/radeon_asic.h | 1 drivers/md/raid10.c | 100 ++++++------ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 11 - fs/nfs/blocklayout/blocklayout.c | 176 +++++++++++++++++++-- fs/nfs/blocklayout/blocklayout.h | 1 kernel/sched/auto_group.c | 4 kernel/sched/auto_group.h | 5 kernel/workqueue.c | 4 mm/memory-failure.c | 8 mm/sparse.c | 10 - scripts/package/buildtar | 2 24 files changed, 406 insertions(+), 191 deletions(-)
Alan Cox (1):
ACPI: missing break
Alex Deucher (3):
drm/radeon/dce4+: don't use radeon_crtc for vblank callback drm/radeon: properly handle mc_stop/mc_resume on evergreen+ (v2) drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop()
Ariel Elior (1):
bnx2x: remove redundant warning log
Calvin Walton (1):
i915: Quirk no_lvds on Gigabyte GA-D525TUD ITX motherboard
Chris Wilson (1):
drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
Greg Kroah-Hartman (1):
Linux 3.4.23
Jason Gunthorpe (1):
ARM: Kirkwood: Update PCI-E fixup
Jean Delvare (1):
i7300_edac: Fix error flag testing
Jianguo Wu (1):
mm/vmemmap: fix wrong use of virt_to_page
Michal Marek (1):
kbuild: Do not package /boot and /lib in make tar-pkg
Mike Galbraith (2):
workqueue: exit rescuer_thread() as TASK_RUNNING
Revert "sched, autogroup: Stop going ahead if autogroup is disabled"
Naoya Horiguchi (1):
mm: soft offline: split thp at the beginning of soft_offline_page()
NeilBrown (1):
md/raid10: close race that lose writes lost when replacement completes.
Peng Tao (1):
pnfsblock: fix partial page buffer wirte
Russell King - ARM Linux (2):
Dove: Attempt to fix PMU/RTC interrupts
Dove: Fix irq_to_pmu()
Vincent Palatin (1):
x86, fpu: Avoid FPU lazy restore after suspend
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 22 +SUBLEVEL = 23 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/Kconfig +1 -0
@@ -579,6 +579,7 @@ config ARCH_KIRKWOOD bool "Marvell Kirkwood" select CPU_FEROCEON select PCI + select PCI_QUIRKS select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select NEED_MACH_IO_H
arch/arm/mach-dove/include/mach/pm.h +1 -1
@@ -45,7 +45,7 @@ static inline int pmu_to_irq(int pin)static inline int irq_to_pmu (int irq) { -if (IRQ_DOVE_PMU_START < irq && irq <NR_IRQS ) +if (IRQ_DOVE_PMU_START <= irq && irq <NR_IRQS )return irq -IRQ_DOVE_PMU_START ;return -EINVAL ;
arch/arm/mach-dove/irq.c +13 -1
@@ -61,8 +61,20 @@ static void pmu_irq_ack(struct irq_data *d)int pin =irq_to_pmu (d->irq);u32 u; +/* +* The PMU mask register is not RW0C: it is RW. This means that +* the bits take whatever value is written to them; if you write +* a '1', you will set the interrupt. +* +* Unfortunately this means there is NO race free way to clear +* these interrupts. +* +* So, let's structure the code so that the window is as small as +* possible. +*/ u = ~(1 << (pin &31 )); -writel (u,PMU_INTERRUPT_CAUSE ); + u &=readl_relaxed (PMU_INTERRUPT_CAUSE ); +writel_relaxed (u,PMU_INTERRUPT_CAUSE ); }static struct irq_chip pmu_irq_chip = {
arch/arm/mach-kirkwood/pcie.c +8 -3
@@ -212,14 +212,19 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)return 1 ; } +/* +* The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it +* is operating as a root complex this needs to be switched to +* PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on +* the device. Decoding setup is handled by the orion code. +*/ static void __devinit rc_pci_fixup (struct pci_dev *dev) { -/* -* Prevent enumeration of root complex. -*/ if (dev->bus->parent ==NULL && dev->devfn ==0 ) {int i; + dev->class &=0xff ; + dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ;for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { dev->resource[i].start =0 ; dev->resource[i].end =0 ;
arch/x86/include/asm/fpu-internal.h +9 -6
@@ -334,14 +334,17 @@ static inline void __thread_fpu_begin(struct task_struct *tsk)typedef struct {int preload; }fpu_switch_t ;/* -* FIXME! We could do a totally lazy restore, but we need to -* add a per-cpu "this was the task that last touched the FPU -* on this CPU" variable, and the task needs to have a "I last -* touched the FPU on this CPU" and check them. +* Must be run with preemption disabled: this clears the fpu_owner_task, +* on this CPU. * -* We don't do that yet, so "fpu_lazy_restore()" always returns -* false, but some day.. +* This will disable any lazy FPU state restore of the current FPU state, +* but if the current thread owns the FPU, it will still be saved by. */ +static inline void __cpu_disable_lazy_restore (unsigned int cpu) +{ +per_cpu (fpu_owner_task, cpu) =NULL ; +} +static inline int fpu_lazy_restore (struct task_struct *new,unsigned int cpu) { return new == percpu_read_stable(fpu_owner_task) &&
arch/x86/kernel/smpboot.c +5 -0
@@ -66,6 +66,8 @@#include <asm/mwait.h> #include <asm/apic.h> #include <asm/io_apic.h> +#include <asm/i387.h> +#include <asm/fpu-internal.h> #include <asm/setup.h> #include <asm/uv/uv.h> #include <linux/mc146818rtc.h>
@@ -851,6 +853,9 @@ int __cpuinit native_cpu_up(unsigned int cpu)per_cpu (cpu_state, cpu) =CPU_UP_PREPARE ; +/* the FPU context is blank, nobody can own it */ +__cpu_disable_lazy_restore (cpu); + err =do_boot_cpu (apicid, cpu);if (err) {pr_debug ("do_boot_cpu failed %d\n" , err);
drivers/acpi/processor_driver.c +1 -0
@@ -407,6 +407,7 @@ static void acpi_processor_notify(struct acpi_device *device, u32 event)acpi_bus_generate_proc_event (device, event,0 );acpi_bus_generate_netlink_event (device->pnp.device_class,dev_name (&device->dev), event,0 ); +break ;default :ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"Unsupported event [0x%x]\n" , event));
drivers/edac/i7300_edac.c +4 -4
@@ -215,8 +215,8 @@ static const char *ferr_fat_fbd_name[] = { [0 ] ="Memory Write error on non-redundant retry or " "FBD configuration Write error on retry", }; -#define GET_FBD_FAT_IDX (fbderr) (fbderr & (3 << 28)) -#define FERR_FAT_FBD_ERR_MASK ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3)) +#define GET_FBD_FAT_IDX (fbderr) (((fbderr) >> 28) & 3) +#define FERR_FAT_FBD_ERR_MASK ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 22))#define FERR_NF_FBD 0xa0static const char *ferr_nf_fbd_name[] = {
@@ -243,7 +243,7 @@ static const char *ferr_nf_fbd_name[] = { [1] = "Aliased Uncorrectable Non-Mirrored Demand Data ECC", [0] = "Uncorrectable Data ECC on Replay", }; -#define GET_FBD_NF_IDX (fbderr) (fbderr & (3 << 28)) +#define GET_FBD_NF_IDX (fbderr) (((fbderr) >> 28) & 3)#define FERR_NF_FBD_ERR_MASK ((1 << 24) | (1 << 23) | (1 << 22) | (1 << 21) |\ (1 << 18) | (1 << 17) | (1 << 16) | (1 << 15) |\ (1 << 14) | (1 << 13) | (1 << 11) | (1 << 10) |\
@@ -485,7 +485,7 @@ static void i7300_process_fbd_error(struct mem_ctl_info *mci) errnum =find_first_bit (&errors,ARRAY_SIZE (ferr_nf_fbd_name)); specific =GET_ERR_FROM_TABLE (ferr_nf_fbd_name, errnum); - branch = (GET_FBD_FAT_IDX (error_reg) ==2 ) ?1 :0 ; + branch = (GET_FBD_NF_IDX (error_reg) ==2 ) ?1 :0 ;pci_read_config_dword (pvt->pci_dev_16_1_fsb_addr_map,REDMEMA , &syndrome);
drivers/gpu/drm/i915/intel_lvds.c +16 -0
@@ -785,6 +785,22 @@ static const struct dmi_system_id intel_no_lvds[] = { DMI_MATCH(DMI_BOARD_NAME, "ZBOXSD-ID12/ID13"), }, }, + { + .callback = intel_no_lvds_dmi_callback, + .ident = "Gigabyte GA-D525TUD", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."), + DMI_MATCH(DMI_BOARD_NAME, "D525TUD"), + }, + }, + { + .callback = intel_no_lvds_dmi_callback, + .ident = "Supermicro X7SPA-H", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"), + DMI_MATCH(DMI_PRODUCT_NAME, "X7SPA-H"), + }, + }, { }/* terminating entry */ };
drivers/gpu/drm/radeon/evergreen.c +96 -95
235 lines not on this page · raw message
drivers/gpu/drm/radeon/evergreen_reg.h +2 -0
@@ -218,6 +218,8 @@#define EVERGREEN_CRTC_CONTROL 0x6e70# define EVERGREEN_CRTC_MASTER_EN (1 << 0)# define EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE (1 << 24) +#define EVERGREEN_CRTC_BLANK_CONTROL 0x6e74 +# define EVERGREEN_CRTC_BLANK_DATA_EN (1 << 8)#define EVERGREEN_CRTC_STATUS 0x6e8c# define EVERGREEN_CRTC_V_BLANK (1 << 0)#define EVERGREEN_CRTC_STATUS_POSITION 0x6e90
drivers/gpu/drm/radeon/evergreend.h +7 -0
@@ -77,6 +77,10 @@#define CONFIG_MEMSIZE 0x5428 +#define BIF_FB_EN 0x5490 +#define FB_READ_EN (1 << 0) +#define FB_WRITE_EN (1 << 1) +#define CP_STRMOUT_CNTL 0x84FC#define CP_COHER_CNTL 0x85F0
@@ -200,6 +204,9 @@#define NOOFCHAN_MASK 0x00003000#define MC_SHARED_CHREMAP 0x2008 +#define MC_SHARED_BLACKOUT_CNTL 0x20ac +#define BLACKOUT_MODE_MASK 0x00000007 +#define MC_ARB_RAMCFG 0x2760#define NOOFBANK_SHIFT 0#define NOOFBANK_MASK 0x00000003
drivers/gpu/drm/radeon/radeon_asic.h +1 -0
@@ -400,6 +400,7 @@ void r700_cp_fini(struct radeon_device *rdev);struct evergreen_mc_save {u32 vga_render_control;u32 vga_hdp_control; +bool crtc_enabled[RADEON_MAX_CRTCS ]; };void evergreen_pcie_gart_tlb_flush (struct radeon_device *rdev);
drivers/md/raid10.c +53 -47
130 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +7 -4
@@ -9131,10 +9131,13 @@ static int __devinit bnx2x_prev_unload_common(struct bnx2x *bp)*/ static void __devinit bnx2x_prev_interrupted_dmae (struct bnx2x *bp) { -u32 val =REG_RD (bp,PGLUE_B_REG_PGLUE_B_INT_STS ); -if (val &PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN ) { -BNX2X_ERR ("was error bit was found to be set in pglueb upon startup. Clearing" ); -REG_WR (bp,PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR ,1 <<BP_FUNC (bp)); +if (!CHIP_IS_E1x (bp)) { +u32 val =REG_RD (bp,PGLUE_B_REG_PGLUE_B_INT_STS ); +if (val &PGLUE_B_PGLUE_B_INT_STS_REG_WAS_ERROR_ATTN ) { +BNX2X_ERR ("was error bit was found to be set in pglueb upon startup. Clearing" ); +REG_WR (bp,PGLUE_B_REG_WAS_ERROR_PF_7_0_CLR , +1 <<BP_FUNC (bp)); + } } }
fs/nfs/blocklayout/blocklayout.c +164 -12
257 lines not on this page · raw message
fs/nfs/blocklayout/blocklayout.h +1 -0
@@ -41,6 +41,7 @@#define PAGE_CACHE_SECTORS (PAGE_CACHE_SIZE >> SECTOR_SHIFT)#define PAGE_CACHE_SECTOR_SHIFT (PAGE_CACHE_SHIFT - SECTOR_SHIFT) +#define SECTOR_SIZE (1 << SECTOR_SHIFT)struct block_mount_id {spinlock_t bm_lock;/* protects list */
kernel/sched/auto_group.c +0 -4
@@ -143,15 +143,11 @@ autogroup_move_group(struct task_struct *p, struct autogroup *ag) p->signal->autogroup =autogroup_kref_get (ag); -if (!ACCESS_ONCE (sysctl_sched_autogroup_enabled)) - goto out; - t = p; do { sched_move_task(t); } while_each_thread(p, t); -out: unlock_task_sighand(p, &flags); autogroup_kref_put(prev); }
kernel/sched/auto_group.h +0 -5
@@ -4,11 +4,6 @@#include <linux/rwsem.h> struct autogroup { -/* -* reference doesn't mean how many thread attach to this -* autogroup now. It just stands for the number of task -* could use this autogroup. -*/ struct kref kref;struct task_group *tg;struct rw_semaphore lock;
kernel/workqueue.c +3 -1
@@ -2040,8 +2040,10 @@ static int rescuer_thread(void *__wq) repeat:set_current_state (TASK_INTERRUPTIBLE ); -if (kthread_should_stop ()) +if (kthread_should_stop ()) { +__set_current_state (TASK_RUNNING );return 0 ; + }/* * See whether any cpu is asking for help. Unbounded
mm/memory-failure.c +8 -0
@@ -1481,9 +1481,17 @@ int soft_offline_page(struct page *page, int flags) {int ret;unsigned long pfn =page_to_pfn (page); +struct page *hpage =compound_trans_head (page);if (PageHuge (page))return soft_offline_huge_page (page, flags); +if (PageTransHuge (hpage)) { +if (PageAnon (hpage) &&unlikely (split_huge_page (hpage))) { +pr_info ("soft offline: %#lx: failed to split THP\n" , + pfn); +return -EBUSY ; + } + } ret =get_any_page (page, pfn, flags);if (ret <0 )
mm/sparse.c +4 -6
@@ -619,7 +619,7 @@ static void __kfree_section_memmap(struct page *memmap, unsigned long nr_pages) {return ;/* XXX: Not implemented yet */ } -static void free_map_bootmem (struct page *page,unsigned long nr_pages) +static void free_map_bootmem (struct page *memmap,unsigned long nr_pages) { }#else
@@ -660,10 +660,11 @@ static void __kfree_section_memmap(struct page *memmap, unsigned long nr_pages) get_order(sizeof(struct page) * nr_pages)); } -static void free_map_bootmem (struct page *page,unsigned long nr_pages) +static void free_map_bootmem (struct page *memmap,unsigned long nr_pages) {unsigned long maps_section_nr, removing_section_nr, i;unsigned long magic; +struct page *page =virt_to_page (memmap);for (i =0 ; i < nr_pages; i++, page++) { magic = (unsigned long ) page->lru.next;
@@ -712,13 +713,10 @@ static void free_section_usemap(struct page *memmap, unsigned long *usemap)*/ if (memmap) { -struct page *memmap_page; - memmap_page =virt_to_page (memmap); - nr_pages =PAGE_ALIGN (PAGES_PER_SECTION *sizeof (struct page )) >>PAGE_SHIFT ; -free_map_bootmem (memmap_page, nr_pages); +free_map_bootmem (memmap, nr_pages); } }
scripts/package/buildtar +1 -1
@@ -109,7 +109,7 @@ esac if tar --owner=root --group=root --help >/dev/null 2>&1; then opts="--owner=root --group=root" fi - tar cf - . $opts | ${compress} > "${tarball}${file_ext}" + tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}" ) echo "Tarball successfully created in ${tarball}${file_ext}"