Linux 3.4.2
Greg KH
maintainerI'm announcing the release of the 3.4.2 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 | 2 arch/arm/mach-ixp4xx/common.c | 48 +++++++++ arch/arm/mach-ixp4xx/include/mach/gpio.h | 79 ---------------- arch/ia64/include/asm/Kbuild | 1 arch/microblaze/Kconfig | 2 arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 1 arch/parisc/kernel/entry.S | 30 +++--- arch/parisc/kernel/vmlinux.lds.S | 6 - arch/x86/kernel/nmi.c | 6 - arch/x86/kernel/ptrace.c | 6 - arch/x86/xen/enlighten.c | 3 drivers/acpi/battery.c | 10 +- drivers/atm/solos-pci.c | 4 drivers/gpu/drm/i915/intel_display.c | 2 drivers/gpu/drm/i915/intel_dp.c | 17 +-- drivers/gpu/drm/i915/intel_lvds.c | 8 + drivers/gpu/drm/i915/intel_sdvo.c | 12 +- drivers/gpu/drm/i915/intel_sdvo_regs.h | 5 + drivers/gpu/drm/i915/intel_tv.c | 53 ++++++++++ drivers/gpu/drm/radeon/evergreen.c | 18 ++- drivers/gpu/drm/radeon/evergreend.h | 1 drivers/gpu/drm/radeon/ni.c | 32 ++++-- drivers/gpu/drm/radeon/r600_audio.c | 5 - drivers/gpu/drm/radeon/radeon_atombios.c | 4 drivers/gpu/drm/radeon/radeon_cs.c | 31 +++--- drivers/gpu/drm/radeon/radeon_gart.c | 19 ++- drivers/gpu/drm/radeon/rv770.c | 10 +- drivers/gpu/drm/radeon/rv770d.h | 1 drivers/gpu/drm/ttm/ttm_bo.c | 1 drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 drivers/iommu/amd_iommu.c | 108 ++++++++++++++-------- drivers/iommu/amd_iommu_init.c | 13 +- drivers/iommu/amd_iommu_types.h | 3 drivers/md/raid1.c | 4 drivers/md/raid10.c | 5 - drivers/mtd/Kconfig | 2 drivers/mtd/devices/block2mtd.c | 1 drivers/mtd/nand/mxc_nand.c | 12 +- drivers/mtd/nand/nand_bbt.c | 1 drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 drivers/net/usb/asix.c | 3 drivers/net/wireless/ath/ath9k/xmit.c | 16 ++- drivers/net/wireless/iwlwifi/iwl-2000.c | 4 drivers/net/wireless/iwlwifi/iwl-6000.c | 6 - drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 drivers/net/wireless/wl1251/sdio.c | 2 drivers/net/wireless/wl1251/spi.c | 3 drivers/scsi/scsi_lib.c | 11 +- drivers/scsi/scsi_wait_scan.c | 2 fs/attr.c | 5 + fs/cifs/cifsglob.h | 1 fs/cifs/cifsproto.h | 6 - fs/cifs/cifssmb.c | 12 +- fs/cifs/file.c | 57 ++++++----- fs/cifs/readdir.c | 15 ++- fs/exofs/super.c | 2 fs/ext4/ialloc.c | 10 +- fs/ext4/ioctl.c | 13 +- fs/ext4/mballoc.c | 6 - fs/ext4/namei.c | 6 + fs/ext4/resize.c | 2 fs/ext4/super.c | 4 fs/namespace.c | 3 fs/nfs/idmap.c | 10 -- fs/nfs/nfs4proc.c | 2 fs/proc/base.c | 17 ++- fs/proc/task_mmu.c | 2 include/drm/drm_pciids.h | 17 +++ include/linux/Kbuild | 1 include/linux/kernel-page-flags.h | 4 include/linux/radix-tree.h | 5 - include/linux/skbuff.h | 2 include/net/dst.h | 1 kernel/fork.c | 3 lib/radix-tree.c | 3 mm/hugetlb.c | 29 ++++- mm/slub.c | 9 + mm/vmalloc.c | 3 mm/vmscan.c | 2 net/ipv4/esp4.c | 24 +--- net/ipv4/fib_semantics.c | 12 +- net/ipv6/esp6.c | 18 +-- net/ipv6/ip6_output.c | 68 ++++++++++--- net/l2tp/l2tp_ip.c | 30 ++++-- net/mac80211/util.c | 12 +- net/sunrpc/clnt.c | 2 net/sunrpc/xprt.c | 5 - net/xfrm/xfrm_policy.c | 3 sound/usb/pcm.c | 3 tools/vm/page-types.c | 28 ----- 91 files changed, 669 insertions(+), 408 deletions(-)
Al Viro (1):
vfs: umount_tree() might be called on subtree that had never made it
Alex Deucher (9):
drm/radeon: fix XFX quirk
drm/radeon: fix typo in trinity tiling setup
drm/radeon: fix regression in UMS CS ioctl
drm/radeon: fix bank information in tiling config
drm/radeon: properly program gart on rv740, juniper, cypress, barts, hemlock drm/radeon/kms: add new Trinity PCI ids
drm/radeon/kms: add new Palm, Sumo PCI ids
drm/radeon/kms: add new BTC PCI ids
drm/radeon/kms: add new SI PCI ids
Andreas Dilger (1):
ext4: disallow hard-linked directory in ext4_lookup
Andy Whitcroft (1):
ACPI battery: only refresh the sysfs files when pertinent information changes
Benjamin Poirier (1):
xfrm: take net hdr len into account for esp payload size calculation
Boaz Harrosh (1):
exofs: Fix CRASH on very early IO errors.
Chris Wilson (1):
drm/i915/dp: Flush any outstanding work to turn the VDD off
Christian König (1):
drm/radeon: fix vm deadlocks on cayman
Clemens Ladisch (1):
ALSA: usb-audio: fix rate_list memory leak
Dan Carpenter (2):
NFS: kmalloc() doesn't return an ERR_PTR()
ext4: fix potential NULL dereference in ext4_free_inodes_counts()
Daniel Vetter (3):
drm/i915: properly handle interlaced bit for sdvo dtd conversion drm/i915: wait for a vblank to pass after tv detect drm/i915: enable vdd when switching off the eDP panel
Dave Hansen (2):
hugetlb: fix resv_map leak in error path
mm: fix vma_resv_map() NULL pointer
David Woodhouse (1):
solos-pci: Fix DMA support
Dmitry Kasatkin (1):
vfs: increment iversion when a file is truncated
Dmitry Maluka (1):
mtd: nand: fix scan_read_raw_oob
Eric Dumazet (1):
asix: allow full size 8021Q frames to be received
Eric Sandeen (1):
ext4: force ro mount if ext4_setup_super() fails
Eyal Shapira (1):
mac80211: fix ADDBA declined after suspend with wowlan
Felix Fietkau (2):
ath9k: fix a use-after-free-bug when ath_tx_setup_buffer() fails
skb: avoid unnecessary reallocations in __skb_cow
Frank Svendsboe (1):
mtd: of_parts: fix breakage in Kconfig
Gabor Juhos (1):
mtd: block2mtd: fix recursive call of mtd_writev
Gao feng (1):
ipv6: fix incorrect ipsec fragment
Grazvydas Ignotas (1):
wl1251: fix oops on early interrupt
Greg Kroah-Hartman (1):
Linux 3.4.2
H.J. Lu (1):
x86, x32, ptrace: Remove PTRACE_ARCH_PRCTL for x32
Haogang Chen (1):
ext4: fix potential integer overflow in alloc_flex_gd()
James Bottomley (2):
SCSI: fix scsi_wait_scan
PARISC: fix TLB fault path on PA2.0 narrow systems
James Chapman (1):
l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case
Jan-Benedict Glaw (1):
drm/i915: no lvds quirk for HP t5740e Thin Client
Jerome Glisse (1):
drm/radeon: fix HD6790, HD6570 backend programming
Jesse Barnes (1):
drm/i915: always use RPNSWREQ for turbo change requests
Joerg Roedel (4):
iommu/amd: Check for the right TLP prefix bit iommu/amd: Add workaround for event log erratum iommu/amd: Cache pdev pointer to root-bridge iommu/amd: Fix deadlock in ppr-handling error path
John David Anglin (1):
PARISC: fix boot failure on 32-bit systems caused by branch stubs placed before .text
Jonas Gorski (1):
MIPS: BCM63XX: Add missing include for bcm63xx_gpio.h
Joonsoo Kim (1):
slub: fix a memory leak in get_partial_node()
Jun'ichi Nomura (1):
SCSI: Fix dm-multipath starvation when scsi host is busy
Konrad Rzeszutek Wilk (1):
x86, amd, xen: Avoid NULL pointer paravirt references
Konstantin Khlebnikov (1):
radix-tree: fix contiguous iterator
KyongHo (1):
mm: fix faulty initialization in vmalloc_init()
Lars-Peter Clausen (1):
microblaze: Do not select GENERIC_GPIO by default
Linus Torvalds (1):
vfs: Fix /proc/<tid>/fdinfo/<fd> file handling
Meenakshi Venkataraman (2):
iwlwifi: update BT traffic load states correctly
iwlwifi: do not use shadow registers by default
Michal Hocko (1):
mm: consider all swapped back pages in used-once logic
NeilBrown (1):
md: raid1/raid10: fix problem with merge_bvec_fn
Rafał Miłecki (1):
drm/radeon/audio: don't hardcode CRTC id
Richard Cochran (1):
ixp4xx: fix compilation by adding gpiolib support
Rodrigo Vivi (1):
drm/i915: Adding TV Out Missing modes.
Salman Qazi (2):
ext4: add ext4_mb_unload_buddy in the error path
ext4: remove mb_groups before tearing down the buddy_cache
Sascha Hauer (1):
mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
Sasha Levin (1):
mm: fix NULL ptr deref when walking hugepages
Shirish Pargaonkar (2):
cifs: Include backup intent search flags during searches {try #2)
cifs: fix oops while traversing open file list (try #4)
Siddhesh Poyarekar (1):
mm/fork: fix overflow in vma length when copying mmap on clone
Stephan Gatzka (1):
fec_mpc52xx: fix timestamp filtering
Steven Rostedt (1):
x86: Reset the debug_stack update counter
Tao Ma (1):
ext4: don't set i_flags in EXT4_IOC_SETFLAGS
Theodore Ts'o (2):
ext4: add missing save_error_info() to ext4_error()
ext4: don't trash state flags in EXT4_IOC_SETFLAGS
Thomas Hellstrom (2):
drm/ttm: Fix spinlock imbalance
drm/vmwgfx: Fix nasty write past alloced memory area
Trond Myklebust (2):
NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIO
sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot
Ulrich Drepper (1):
kbuild: install kernel-page-flags.h
Yanmin Zhang (1):
ipv4: fix the rcu race between free_fib_info and ip_route_output_slow
maximilian attems (1):
IA64: Add cmpxchg.h to exported userspace headers
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 4 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = NAME = Saber-toothed Squirrel
arch/arm/Kconfig +1 -1
@@ -556,7 +556,7 @@ config ARCH_IXP4XX select ARCH_HAS_DMA_SET_COHERENT_MASK select CLKSRC_MMIO select CPU_XSCALE - select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI select NEED_MACH_IO_H
arch/arm/mach-ixp4xx/common.c +46 -2
78 lines not on this page · raw message
arch/arm/mach-ixp4xx/include/mach/gpio.h +1 -78
80 lines not on this page · raw message
arch/ia64/include/asm/Kbuild +1 -0
@@ -1,6 +1,7 @@ include include/asm-generic/Kbuild.asm header-y += break.h +header-y += cmpxchg.h header-y += fpu.h header-y += gcc_intrin.h header-y += ia64regs.h
arch/microblaze/Kconfig +1 -1
@@ -57,7 +57,7 @@ config GENERIC_CLOCKEVENTS def_bool y config GENERIC_GPIO - def_bool y + bool config GENERIC_CSUM def_bool y
arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +1 -0
@@ -2,6 +2,7 @@#define BCM63XX_GPIO_H #include <linux/init.h> +#include <bcm63xx_cpu.h> int __init bcm63xx_gpio_init (void );
arch/parisc/kernel/entry.S +17 -13
@@ -552,7 +552,7 @@ * entry (identifying the physical page) and %r23 up with * the from tlb entry (or nothing if only a to entry---for * clear_user_page_asm) */ - .macro do_alias spc,tmp,tmp1,va,pte,prot,fault + .macro do_alias spc,tmp,tmp1,va,pte,prot,fault,patype cmpib,COND(<>),n 0,\spc,\fault ldil L%(TMPALIAS_MAP_START),\tmp #if defined(CONFIG_64BIT) && (TMPALIAS_MAP_START >= 0x80000000)
@@ -581,11 +581,15 @@ */ cmpiclr,= 0x01,\tmp,%r0 ldi (_PAGE_DIRTY|_PAGE_READ|_PAGE_WRITE),\prot -#ifdef CONFIG_64BIT +.ifc \patype,20 depd,z \prot,8,7,\prot -#else +.else +.ifc \patype,11 depw,z \prot,8,7,\prot -#endif +.else + .error "undefined PA type to do_alias" +.endif +.endif /* * OK, it is in the temp alias region, check whether "from" or "to". * Check "subtle" note in pacache.S re: r23/r26.
@@ -1189,7 +1193,7 @@ dtlb_miss_20w: nop dtlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20 idtlbt pte,prot
@@ -1213,7 +1217,7 @@ nadtlb_miss_20w: nop nadtlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20 idtlbt pte,prot
@@ -1245,7 +1249,7 @@ dtlb_miss_11: nop dtlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,11 idtlba pte,(va) idtlbp prot,(va)
@@ -1277,7 +1281,7 @@ nadtlb_miss_11: nop nadtlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,11 idtlba pte,(va) idtlbp prot,(va)
@@ -1304,7 +1308,7 @@ dtlb_miss_20: nop dtlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,dtlb_fault + do_alias spc,t0,t1,va,pte,prot,dtlb_fault,20 idtlbt pte,prot
@@ -1330,7 +1334,7 @@ nadtlb_miss_20: nop nadtlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate + do_alias spc,t0,t1,va,pte,prot,nadtlb_emulate,20 idtlbt pte,prot
@@ -1457,7 +1461,7 @@ naitlb_miss_20w: nop naitlb_check_alias_20w: - do_alias spc,t0,t1,va,pte,prot,naitlb_fault + do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20 iitlbt pte,prot
@@ -1511,7 +1515,7 @@ naitlb_miss_11: nop naitlb_check_alias_11: - do_alias spc,t0,t1,va,pte,prot,itlb_fault + do_alias spc,t0,t1,va,pte,prot,itlb_fault,11 iitlba pte,(%sr0, va) iitlbp prot,(%sr0, va)
@@ -1557,7 +1561,7 @@ naitlb_miss_20: nop naitlb_check_alias_20: - do_alias spc,t0,t1,va,pte,prot,naitlb_fault + do_alias spc,t0,t1,va,pte,prot,naitlb_fault,20 iitlbt pte,prot
arch/parisc/kernel/vmlinux.lds.S +4 -2
@@ -50,8 +50,10 @@ SECTIONS . = KERNEL_BINARY_TEXT_START; _text = .; /* Text and read-only data */ - .text ALIGN(16) : { + .head ALIGN(16) : { HEAD_TEXT + } = 0 + .text ALIGN(16) : { TEXT_TEXT SCHED_TEXT LOCK_TEXT
@@ -65,7 +67,7 @@ SECTIONS *(.fixup) *(.lock.text) /* out-of-line lock text */ *(.gnu.warning) - } = 0 + } /* End of text section */ _etext = .;
arch/x86/kernel/nmi.c +4 -2
@@ -491,14 +491,16 @@ static inline void nmi_nesting_preprocess(struct pt_regs *regs)*/ if (unlikely (is_debug_stack (regs->sp))) {debug_stack_set_zero (); -__get_cpu_var (update_debug_stack) =1 ; +this_cpu_write (update_debug_stack,1 ); } }static inline void nmi_nesting_postprocess (void ) { -if (unlikely (__get_cpu_var (update_debug_stack))) +if (unlikely (this_cpu_read (update_debug_stack))) {debug_stack_reset (); +this_cpu_write (update_debug_stack,0 ); + } }#endif
arch/x86/kernel/ptrace.c +0 -6
@@ -1211,12 +1211,6 @@ static long x32_arch_ptrace(struct task_struct *child,0 ,sizeof (struct user_i387_struct ), datap); -/* normal 64bit interface to access TLS data. -Works just like arch_prctl, except that the arguments -are reversed. */ -case PTRACE_ARCH_PRCTL : -return do_arch_prctl (child, data, addr); -default :return compat_ptrace_request (child, request, addr, data); }
arch/x86/xen/enlighten.c +3 -0
@@ -1106,7 +1106,10 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .wbinvd = native_wbinvd, .read_msr = native_read_msr_safe, + .rdmsr_regs = native_rdmsr_safe_regs, .write_msr = xen_write_msr_safe, + .wrmsr_regs = native_wrmsr_safe_regs, + .read_tsc = native_read_tsc, .read_pmc = native_read_pmc,
drivers/acpi/battery.c +9 -1
@@ -643,11 +643,19 @@ static int acpi_battery_update(struct acpi_battery *battery)static void acpi_battery_refresh (struct acpi_battery *battery) { +int power_unit; +if (!battery->bat.dev)return ; + power_unit = battery->power_unit; +acpi_battery_get_info (battery); -/* The battery may have changed its reporting units. */ + +if (power_unit == battery->power_unit) +return ; + +/* The battery has changed its reporting units. */ sysfs_remove_battery (battery);sysfs_add_battery (battery); }
drivers/atm/solos-pci.c +3 -1
@@ -984,6 +984,7 @@ static uint32_t fpga_tx(struct solos_card *card) }else if (skb && card->using_dma) {SKB_CB (skb)->dma_addr =pci_map_single (card->dev, skb->data, skb->len,PCI_DMA_TODEVICE ); + card->tx_skb[port] = skb;iowrite32 (SKB_CB (skb)->dma_addr, card->config_regs +TX_DMA_ADDR (port)); }
@@ -1152,7 +1153,8 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) db_fpga_upgrade = db_firmware_upgrade =0 ; } -if (card->fpga_version >=DMA_SUPPORTED ){ +if (card->fpga_version >=DMA_SUPPORTED ) { +pci_set_master (dev); card->using_dma =1 ; }else { card->using_dma =0 ;
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -8368,7 +8368,7 @@ void gen6_enable_rps(struct drm_i915_private *dev_priv)I915_WRITE (GEN6_RP_IDLE_HYSTERSIS ,10 ); I915_WRITE(GEN6_RP_CONTROL, GEN6_RP_MEDIA_TURBO | - GEN6_RP_MEDIA_HW_MODE | + GEN6_RP_MEDIA_HW_NORMAL_MODE | GEN6_RP_MEDIA_IS_GFX | GEN6_RP_ENABLE | GEN6_RP_UP_BUSY_AVG |
drivers/gpu/drm/i915/intel_dp.c +8 -9
@@ -1148,10 +1148,10 @@ static void ironlake_edp_panel_off(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("Turn eDP power off\n" ); -WARN (intel_dp->want_panel_vdd,"Cannot turn power off while VDD is on\n" ); +WARN (!intel_dp->want_panel_vdd,"Need VDD to turn off panel\n" ); pp =ironlake_get_pp_control (dev_priv); - pp &= ~(POWER_TARGET_ON |EDP_FORCE_VDD |PANEL_POWER_RESET |EDP_BLC_ENABLE ); + pp &= ~(POWER_TARGET_ON |PANEL_POWER_RESET |EDP_BLC_ENABLE );I915_WRITE (PCH_PP_CONTROL , pp);POSTING_READ (PCH_PP_CONTROL );
@@ -1259,18 +1259,16 @@ static void intel_dp_prepare(struct drm_encoder *encoder) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder); + +/* Make sure the panel is off before trying to change the mode. But also +* ensure that we have vdd while we switch off the panel. */ +ironlake_edp_panel_vdd_on (intel_dp);ironlake_edp_backlight_off (intel_dp);ironlake_edp_panel_off (intel_dp); -/* Wake up the sink first */ -ironlake_edp_panel_vdd_on (intel_dp);intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON );intel_dp_link_down (intel_dp);ironlake_edp_panel_vdd_off (intel_dp, false); - -/* Make sure the panel is off before trying to -* change the mode -*/ }static void intel_dp_commit (struct drm_encoder *encoder)
@@ -1302,10 +1300,11 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)uint32_t dp_reg =I915_READ (intel_dp->output_reg);if (mode !=DRM_MODE_DPMS_ON ) { +/* Switching the panel off requires vdd. */ +ironlake_edp_panel_vdd_on (intel_dp);ironlake_edp_backlight_off (intel_dp);ironlake_edp_panel_off (intel_dp); -ironlake_edp_panel_vdd_on (intel_dp);intel_dp_sink_dpms (intel_dp, mode);intel_dp_link_down (intel_dp);ironlake_edp_panel_vdd_off (intel_dp, false);
drivers/gpu/drm/i915/intel_lvds.c +8 -0
@@ -747,6 +747,14 @@ static const struct dmi_system_id intel_no_lvds[] = { }, { .callback = intel_no_lvds_dmi_callback, + .ident = "Hewlett-Packard HP t5740e Thin Client", + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"Hewlett-Packard" ), + DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Client"), + }, + }, + { + .callback = intel_no_lvds_dmi_callback, .ident = "Hewlett-Packard t5745", .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
drivers/gpu/drm/i915/intel_sdvo.c +8 -4
@@ -769,10 +769,12 @@ static void intel_sdvo_get_dtd_from_mode(struct intel_sdvo_dtd *dtd, ((v_sync_len &0x30 ) >>4 ); dtd->part2.dtd_flags =0x18 ; +if (mode->flags &DRM_MODE_FLAG_INTERLACE ) + dtd->part2.dtd_flags |=DTD_FLAG_INTERLACE ;if (mode->flags &DRM_MODE_FLAG_PHSYNC ) - dtd->part2.dtd_flags |=0x2 ; + dtd->part2.dtd_flags |=DTD_FLAG_HSYNC_POSITIVE ;if (mode->flags &DRM_MODE_FLAG_PVSYNC ) - dtd->part2.dtd_flags |=0x4 ; + dtd->part2.dtd_flags |=DTD_FLAG_VSYNC_POSITIVE ; dtd->part2.sdvo_flags =0 ; dtd->part2.v_sync_off_high = v_sync_offset &0xc0 ;
@@ -806,9 +808,11 @@ static void intel_sdvo_get_mode_from_dtd(struct drm_display_mode * mode, mode->clock = dtd->part1.clock *10 ; mode->flags &= ~(DRM_MODE_FLAG_PHSYNC |DRM_MODE_FLAG_PVSYNC ); -if (dtd->part2.dtd_flags &0x2 ) +if (dtd->part2.dtd_flags &DTD_FLAG_INTERLACE ) + mode->flags |=DRM_MODE_FLAG_INTERLACE ; +if (dtd->part2.dtd_flags &DTD_FLAG_HSYNC_POSITIVE ) mode->flags |=DRM_MODE_FLAG_PHSYNC ; -if (dtd->part2.dtd_flags &0x4 ) +if (dtd->part2.dtd_flags &DTD_FLAG_VSYNC_POSITIVE ) mode->flags |=DRM_MODE_FLAG_PVSYNC ; }
drivers/gpu/drm/i915/intel_sdvo_regs.h +5 -0
@@ -61,6 +61,11 @@ struct intel_sdvo_caps {u16 output_flags; } __attribute__((packed)); +/* Note: SDVO detailed timing flags match EDID misc flags. */ +#define DTD_FLAG_HSYNC_POSITIVE (1 << 1) +#define DTD_FLAG_VSYNC_POSITIVE (1 << 2) +#define DTD_FLAG_INTERLACE (1 << 7) +/** This matches the EDID DTD structure, more or less */ struct intel_sdvo_dtd { struct {
drivers/gpu/drm/i915/intel_tv.c +53 -0
65 lines not on this page · raw message
drivers/gpu/drm/radeon/evergreen.c +13 -5
@@ -1029,6 +1029,11 @@ int evergreen_pcie_gart_enable(struct radeon_device *rdev)WREG32 (MC_VM_MD_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB2_CNTL , tmp); +if ((rdev->family ==CHIP_JUNIPER ) || + (rdev->family ==CHIP_CYPRESS ) || + (rdev->family ==CHIP_HEMLOCK ) || + (rdev->family ==CHIP_BARTS )) +WREG32 (MC_VM_MD_L1_TLB3_CNTL , tmp); }WREG32 (MC_VM_MB_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB1_CNTL , tmp);
@@ -2136,9 +2141,12 @@ static void evergreen_gpu_init(struct radeon_device *rdev)/* num banks is 8 on all fusion asics. 0 = 4, 1 = 8, 2 = 16 */ if (rdev->flags &RADEON_IS_IGP ) rdev->config.evergreen.tile_config |=1 <<4 ; -else - rdev->config.evergreen.tile_config |= - ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ) <<4 ; +else { +if ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ) + rdev->config.evergreen.tile_config |=1 <<4 ; +else + rdev->config.evergreen.tile_config |=0 <<4 ; + } rdev->config.evergreen.tile_config |= ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ) <<8 ; rdev->config.evergreen.tile_config |=
@@ -2170,9 +2178,9 @@ static void evergreen_gpu_init(struct radeon_device *rdev)WREG32 (CC_SYS_RB_BACKEND_DISABLE , rb);WREG32 (GC_USER_RB_BACKEND_DISABLE , rb);WREG32 (CC_GC_SHADER_PIPE_CONFIG , sp); - } + } - grbm_gfx_index |=SE_BROADCAST_WRITES ; + grbm_gfx_index =INSTANCE_BROADCAST_WRITES |SE_BROADCAST_WRITES ;WREG32 (GRBM_GFX_INDEX , grbm_gfx_index);WREG32 (RLC_GFX_INDEX , grbm_gfx_index);
drivers/gpu/drm/radeon/evergreend.h +1 -0
@@ -232,6 +232,7 @@#define MC_VM_MD_L1_TLB0_CNTL 0x2654#define MC_VM_MD_L1_TLB1_CNTL 0x2658#define MC_VM_MD_L1_TLB2_CNTL 0x265C +#define MC_VM_MD_L1_TLB3_CNTL 0x2698#define FUS_MC_VM_MD_L1_TLB0_CNTL 0x265C#define FUS_MC_VM_MD_L1_TLB1_CNTL 0x2660
drivers/gpu/drm/radeon/ni.c +24 -8
@@ -657,15 +657,28 @@ static void cayman_gpu_init(struct radeon_device *rdev) rdev->config.cayman.max_pipes_per_simd =4 ; rdev->config.cayman.max_tile_pipes =2 ;if ((rdev->pdev->device ==0x9900 ) || - (rdev->pdev->device ==0x9901 )) { + (rdev->pdev->device ==0x9901 ) || + (rdev->pdev->device ==0x9905 ) || + (rdev->pdev->device ==0x9906 ) || + (rdev->pdev->device ==0x9907 ) || + (rdev->pdev->device ==0x9908 ) || + (rdev->pdev->device ==0x9909 ) || + (rdev->pdev->device ==0x9910 ) || + (rdev->pdev->device ==0x9917 )) { rdev->config.cayman.max_simds_per_se =6 ; rdev->config.cayman.max_backends_per_se =2 ; }else if ((rdev->pdev->device ==0x9903 ) || - (rdev->pdev->device ==0x9904 )) { + (rdev->pdev->device ==0x9904 ) || + (rdev->pdev->device ==0x990A ) || + (rdev->pdev->device ==0x9913 ) || + (rdev->pdev->device ==0x9918 )) { rdev->config.cayman.max_simds_per_se =4 ; rdev->config.cayman.max_backends_per_se =2 ; - }else if ((rdev->pdev->device ==0x9990 ) || - (rdev->pdev->device ==0x9991 )) { + }else if ((rdev->pdev->device ==0x9919 ) || + (rdev->pdev->device ==0x9990 ) || + (rdev->pdev->device ==0x9991 ) || + (rdev->pdev->device ==0x9994 ) || + (rdev->pdev->device ==0x99A0 )) { rdev->config.cayman.max_simds_per_se =3 ; rdev->config.cayman.max_backends_per_se =1 ; }else {
@@ -865,10 +878,13 @@ static void cayman_gpu_init(struct radeon_device *rdev)/* num banks is 8 on all fusion asics. 0 = 4, 1 = 8, 2 = 16 */ if (rdev->flags &RADEON_IS_IGP ) - rdev->config.evergreen.tile_config |=1 <<4 ; -else - rdev->config.cayman.tile_config |= - ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ) <<4 ; + rdev->config.cayman.tile_config |=1 <<4 ; +else { +if ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ) + rdev->config.cayman.tile_config |=1 <<4 ; +else + rdev->config.cayman.tile_config |=0 <<4 ; + } rdev->config.cayman.tile_config |= ((gb_addr_config &PIPE_INTERLEAVE_SIZE_MASK ) >>PIPE_INTERLEAVE_SIZE_SHIFT ) <<8 ; rdev->config.cayman.tile_config |=
drivers/gpu/drm/radeon/r600_audio.c +3 -2
@@ -239,6 +239,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)struct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; +struct radeon_crtc *radeon_crtc =to_radeon_crtc (encoder->crtc);int base_rate =48000 ;switch (radeon_encoder->encoder_id) {
@@ -264,8 +265,8 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)WREG32 (EVERGREEN_AUDIO_PLL1_DIV , clock *10 );WREG32 (EVERGREEN_AUDIO_PLL1_UNK ,0x00000071 ); -/* Some magic trigger or src sel? */ -WREG32_P (0x5ac ,0x01 , ~0x77 ); +/* Select DTO source */ +WREG32 (0x5ac , radeon_crtc->crtc_id); }else {switch (dig->dig_encoder) {case 0 :
drivers/gpu/drm/radeon/radeon_atombios.c +3 -1
@@ -444,7 +444,9 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev,*/ if ((dev->pdev->device ==0x9498 ) && (dev->pdev->subsystem_vendor ==0x1682 ) && - (dev->pdev->subsystem_device ==0x2452 )) { + (dev->pdev->subsystem_device ==0x2452 ) && + (i2c_bus->valid == false) && + !(supported_device & (ATOM_DEVICE_TV_SUPPORT |ATOM_DEVICE_CV_SUPPORT ))) {struct radeon_device *rdev = dev->dev_private; *i2c_bus =radeon_lookup_i2c_gpio (rdev,0x93 ); }
drivers/gpu/drm/radeon/radeon_cs.c +17 -14
@@ -158,6 +158,7 @@ static int radeon_cs_sync_rings(struct radeon_cs_parser *p)return 0 ; } +/* XXX: note that this is called from the legacy UMS CS ioctl as well */ int radeon_cs_parser_init (struct radeon_cs_parser *p,void *data) {struct drm_radeon_cs *cs = data;
@@ -252,22 +253,24 @@ int radeon_cs_parser_init(struct radeon_cs_parser *p, void *data) } } -if ((p->cs_flags &RADEON_CS_USE_VM ) && - !p->rdev->vm_manager.enabled) { -DRM_ERROR ("VM not active on asic!\n" ); -return -EINVAL ; - } - -/* we only support VM on SI+ */ -if ((p->rdev->family >=CHIP_TAHITI ) && - ((p->cs_flags &RADEON_CS_USE_VM ) ==0 )) { -DRM_ERROR ("VM required on SI+!\n" ); -return -EINVAL ; - } +/* these are KMS only */ +if (p->rdev) { +if ((p->cs_flags &RADEON_CS_USE_VM ) && + !p->rdev->vm_manager.enabled) { +DRM_ERROR ("VM not active on asic!\n" ); +return -EINVAL ; + } -if (radeon_cs_get_ring (p, ring, priority)) -return -EINVAL ; +/* we only support VM on SI+ */ +if ((p->rdev->family >=CHIP_TAHITI ) && + ((p->cs_flags &RADEON_CS_USE_VM ) ==0 )) { +DRM_ERROR ("VM required on SI+!\n" ); +return -EINVAL ; + } +if (radeon_cs_get_ring (p, ring, priority)) +return -EINVAL ; + }/* deal with non-vm */ if ((p->chunk_ib_idx != -1) &&
drivers/gpu/drm/radeon/radeon_gart.c +12 -7
@@ -478,12 +478,18 @@ int radeon_vm_bo_add(struct radeon_device *rdev,mutex_lock (&vm->mutex);if (last_pfn > vm->last_pfn) { -/* grow va space 32M by 32M */ -unsigned align = ((32 <<20 ) >>12 ) -1 ; +/* release mutex and lock in right order */ +mutex_unlock (&vm->mutex);radeon_mutex_lock (&rdev->cs_mutex); -radeon_vm_unbind_locked (rdev, vm); +mutex_lock (&vm->mutex); +/* and check again */ +if (last_pfn > vm->last_pfn) { +/* grow va space 32M by 32M */ +unsigned align = ((32 <<20 ) >>12 ) -1 ; +radeon_vm_unbind_locked (rdev, vm); + vm->last_pfn = (last_pfn + align) & ~align; + }radeon_mutex_unlock (&rdev->cs_mutex); - vm->last_pfn = (last_pfn + align) & ~align; } head = &vm->va; last_offset =0 ;
@@ -597,8 +603,8 @@ int radeon_vm_bo_rmv(struct radeon_device *rdev,if (bo_va ==NULL )return 0 ; -mutex_lock (&vm->mutex);radeon_mutex_lock (&rdev->cs_mutex); +mutex_lock (&vm->mutex);radeon_vm_bo_update_pte (rdev, vm, bo,NULL );radeon_mutex_unlock (&rdev->cs_mutex);list_del (&bo_va->vm_list);
@@ -643,9 +649,8 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm)struct radeon_bo_va *bo_va, *tmp;int r; -mutex_lock (&vm->mutex); -radeon_mutex_lock (&rdev->cs_mutex); +mutex_lock (&vm->mutex);radeon_vm_unbind_locked (rdev, vm);radeon_mutex_unlock (&rdev->cs_mutex);
drivers/gpu/drm/radeon/rv770.c +8 -2
@@ -151,6 +151,8 @@ int rv770_pcie_gart_enable(struct radeon_device *rdev)WREG32 (MC_VM_MD_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MD_L1_TLB2_CNTL , tmp); +if (rdev->family ==CHIP_RV740 ) +WREG32 (MC_VM_MD_L1_TLB3_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB0_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB1_CNTL , tmp);WREG32 (MC_VM_MB_L1_TLB2_CNTL , tmp);
@@ -689,8 +691,12 @@ static void rv770_gpu_init(struct radeon_device *rdev)if (rdev->family ==CHIP_RV770 ) gb_tiling_config |=BANK_TILING (1 ); -else - gb_tiling_config |=BANK_TILING ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); +else { +if ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ) + gb_tiling_config |=BANK_TILING (1 ); +else + gb_tiling_config |=BANK_TILING (0 ); + } rdev->config.rv770.tiling_nbanks =4 << ((gb_tiling_config >>4 ) &0x3 ); gb_tiling_config |=GROUP_SIZE ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT );if ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT )
drivers/gpu/drm/radeon/rv770d.h +1 -0
@@ -174,6 +174,7 @@#define MC_VM_MD_L1_TLB0_CNTL 0x2654#define MC_VM_MD_L1_TLB1_CNTL 0x2658#define MC_VM_MD_L1_TLB2_CNTL 0x265C +#define MC_VM_MD_L1_TLB3_CNTL 0x2698#define MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR 0x203C#define MC_VM_SYSTEM_APERTURE_HIGH_ADDR 0x2038#define MC_VM_SYSTEM_APERTURE_LOW_ADDR 0x2034
drivers/gpu/drm/ttm/ttm_bo.c +1 -0
@@ -1821,6 +1821,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)spin_unlock (&glob->lru_lock); (void )ttm_bo_cleanup_refs (bo, false, false, false);kref_put (&bo->list_kref, ttm_bo_release_list); +spin_lock (&glob->lru_lock);continue ; }
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c +1 -1
@@ -66,7 +66,7 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv, cmd +=sizeof (remap_cmd) /sizeof (uint32);for (i =0 ; i < num_pages; ++i) { -if (VMW_PPN_SIZE >4 ) +if (VMW_PPN_SIZE <=4 ) *cmd =page_to_pfn (*pages++);else *((uint64_t *)cmd) =page_to_pfn (*pages++);
drivers/iommu/amd_iommu.c +71 -37
172 lines not on this page · raw message
drivers/iommu/amd_iommu_init.c +5 -8
@@ -1029,6 +1029,9 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h)if (!iommu->dev)return 1 ; + iommu->root_pdev =pci_get_bus_and_slot (iommu->dev->bus->number, +PCI_DEVFN (0 ,0 )); + iommu->cap_ptr = h->cap_ptr; iommu->pci_seg = h->pci_seg; iommu->mmio_phys = h->mmio_phys;
@@ -1323,20 +1326,16 @@ static void iommu_apply_resume_quirks(struct amd_iommu *iommu) {int i, j;u32 ioc_feature_control; -struct pci_dev *pdev =NULL ; +struct pci_dev *pdev = iommu->root_pdev;/* RD890 BIOSes may not have completely reconfigured the iommu */ -if (!is_rd890_iommu (iommu->dev)) +if (!is_rd890_iommu (iommu->dev) || !pdev)return ;/* * First, we need to ensure that the iommu is enabled. This is * controlled by a register in the northbridge */ - pdev =pci_get_bus_and_slot (iommu->dev->bus->number,PCI_DEVFN (0 ,0 )); - -if (!pdev) -return ;/* Select Northbridge indirect register 0x75 and enable writing */ pci_write_config_dword (pdev,0x60 ,0x75 | (1 <<7 ));
@@ -1346,8 +1345,6 @@ static void iommu_apply_resume_quirks(struct amd_iommu *iommu)if (!(ioc_feature_control &0x1 ))pci_write_config_dword (pdev,0x64 , ioc_feature_control |1 ); -pci_dev_put (pdev); -/* Restore the iommu BAR */ pci_write_config_dword (iommu->dev, iommu->cap_ptr +4 , iommu->stored_addr_lo);
drivers/iommu/amd_iommu_types.h +3 -0
@@ -481,6 +481,9 @@ struct amd_iommu {/* Pointer to PCI device of this IOMMU */ struct pci_dev *dev; +/* Cache pdev to root device for resume quirks */ +struct pci_dev *root_pdev; +/* physical address of MMIO space */ u64 mmio_phys;/* virtual address of MMIO space */
drivers/md/raid1.c +4 -0
@@ -2548,6 +2548,7 @@ static struct r1conf *setup_conf(struct mddev *mddev) err = -EINVAL ;spin_lock_init (&conf->device_lock);rdev_for_each (rdev, mddev) { +struct request_queue *q;int disk_idx = rdev->raid_disk;if (disk_idx >= mddev->raid_disks || disk_idx <0 )
@@ -2560,6 +2561,9 @@ static struct r1conf *setup_conf(struct mddev *mddev)if (disk->rdev) goto abort; disk->rdev = rdev; + q =bdev_get_queue (rdev->bdev); +if (q->merge_bvec_fn) + mddev->merge_check_needed =1 ; disk->head_position =0 ; }
drivers/md/raid10.c +4 -1
@@ -3311,7 +3311,7 @@ static int run(struct mddev *mddev) (conf->raid_disks / conf->near_copies));rdev_for_each (rdev, mddev) { - +struct request_queue *q; disk_idx = rdev->raid_disk;if (disk_idx >= conf->raid_disks || disk_idx <0 )
@@ -3327,6 +3327,9 @@ static int run(struct mddev *mddev) goto out_free_conf; disk->rdev = rdev; } + q =bdev_get_queue (rdev->bdev); +if (q->merge_bvec_fn) + mddev->merge_check_needed =1 ;disk_stack_limits (mddev->gendisk, rdev->bdev, rdev->data_offset <<9 );
drivers/mtd/Kconfig +1 -1
@@ -128,7 +128,7 @@ config MTD_AFS_PARTS config MTD_OF_PARTS tristate "OpenFirmware partitioning information support" - default Y + default y depends on OF help This provides a partition parsing function which derives
drivers/mtd/devices/block2mtd.c +0 -1
@@ -271,7 +271,6 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size) dev->mtd.flags =MTD_CAP_RAM ; dev->mtd._erase = block2mtd_erase; dev->mtd._write = block2mtd_write; - dev->mtd._writev = mtd_writev; dev->mtd._sync = block2mtd_sync; dev->mtd._read = block2mtd_read; dev->mtd.priv = dev;
drivers/mtd/nand/mxc_nand.c +6 -6
@@ -1219,12 +1219,6 @@ static int __init mxcnd_probe(struct platform_device *pdev)if (nfc_is_v21 () && mtd->writesize ==4096 ) this->ecc.layout = &nandv2_hw_eccoob_4k; -/* second phase scan */ -if (nand_scan_tail (mtd)) { - err = -ENXIO ; - goto escan; - } -if (this->ecc.mode ==NAND_ECC_HW ) {if (nfc_is_v1 ()) this->ecc.strength =1 ;
@@ -1232,6 +1226,12 @@ static int __init mxcnd_probe(struct platform_device *pdev) this->ecc.strength = (host->eccsize ==4 ) ?4 :8 ; } +/* second phase scan */ +if (nand_scan_tail (mtd)) { + err = -ENXIO ; + goto escan; + } +/* Register the partitions */ mtd_device_parse_register (mtd, part_probes,NULL , pdata->parts, pdata->nr_parts);
drivers/mtd/nand/nand_bbt.c +1 -0
@@ -324,6 +324,7 @@ static int scan_read_raw_oob(struct mtd_info *mtd, uint8_t *buf, loff_t offs, buf += mtd->oobsize + mtd->writesize; len -= mtd->writesize; + offs += mtd->writesize; }return 0 ; }
drivers/net/ethernet/freescale/fec_mpc52xx.c +1 -1
@@ -437,7 +437,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) length = status &BCOM_FEC_RX_BD_LEN_MASK ;skb_put (rskb, length -4 );/* length without CRC32 */ rskb->protocol =eth_type_trans (rskb, dev); -if (!skb_defer_rx_timestamp (skb)) +if (!skb_defer_rx_timestamp (rskb))netif_rx (rskb);spin_lock (&priv->lock);
drivers/net/usb/asix.c +2 -1
@@ -35,6 +35,7 @@#include <linux/crc32.h> #include <linux/usb/usbnet.h> #include <linux/slab.h> +#include <linux/if_vlan.h> #define DRIVER_VERSION "22-Dec-2011"#define DRIVER_NAME "asix"
@@ -321,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)return 0 ; } -if ((size > dev->net->mtu +ETH_HLEN ) || +if ((size > dev->net->mtu +ETH_HLEN +VLAN_HLEN ) || (size + offset > skb->len)) {netdev_err (dev->net,"asix_rx_fixup() Bad RX Length %d\n" , size);
drivers/net/wireless/ath/ath9k/xmit.c +10 -6
@@ -64,7 +64,8 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,static struct ath_buf *ath_tx_setup_buffer (struct ath_softc *sc,struct ath_txq *txq,struct ath_atx_tid *tid, -struct sk_buff *skb); +struct sk_buff *skb, +bool dequeue);enum {MCS_HT20 ,
@@ -811,7 +812,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc, fi =get_frame_info (skb); bf = fi->bf;if (!fi->bf) - bf =ath_tx_setup_buffer (sc, txq, tid, skb); + bf =ath_tx_setup_buffer (sc, txq, tid, skb, true);if (!bf)continue ;
@@ -1726,7 +1727,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,return ; } - bf =ath_tx_setup_buffer (sc, txctl->txq, tid, skb); + bf =ath_tx_setup_buffer (sc, txctl->txq, tid, skb, false);if (!bf)return ;
@@ -1753,7 +1754,7 @@ static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq, bf = fi->bf;if (!bf) - bf =ath_tx_setup_buffer (sc, txq, tid, skb); + bf =ath_tx_setup_buffer (sc, txq, tid, skb, false);if (!bf)return ;
@@ -1814,7 +1815,8 @@ u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate)static struct ath_buf *ath_tx_setup_buffer (struct ath_softc *sc,struct ath_txq *txq,struct ath_atx_tid *tid, -struct sk_buff *skb) +struct sk_buff *skb, +bool dequeue) {struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ath_frame_info *fi =get_frame_info (skb);
@@ -1863,6 +1865,8 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,return bf; error: +if (dequeue) +__skb_unlink (skb, &tid->buf_q);dev_kfree_skb_any (skb);return NULL ; }
@@ -1893,7 +1897,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct sk_buff *skb,*/ ath_tx_send_ampdu (sc, tid, skb, txctl); }else { - bf =ath_tx_setup_buffer (sc, txctl->txq, tid, skb); + bf =ath_tx_setup_buffer (sc, txctl->txq, tid, skb, false);if (!bf)return ;
drivers/net/wireless/iwlwifi/iwl-2000.c +2 -2
@@ -183,7 +183,7 @@ static const struct iwl_base_params iwl2000_base_params = { .chain_noise_scale = 1000, .wd_timeout = IWL_DEF_WD_TIMEOUT, .max_event_log_size = 512, - .shadow_reg_enable = true, + .shadow_reg_enable = false, /* TODO: fix bugs using this feature */ .hd_v2 = true, };
@@ -202,7 +202,7 @@ static const struct iwl_base_params iwl2030_base_params = { .chain_noise_scale = 1000, .wd_timeout = IWL_LONG_WD_TIMEOUT, .max_event_log_size = 512, - .shadow_reg_enable = true, + .shadow_reg_enable = false, /* TODO: fix bugs using this feature */ .hd_v2 = true, };
drivers/net/wireless/iwlwifi/iwl-6000.c +3 -3
@@ -282,7 +282,7 @@ static const struct iwl_base_params iwl6000_base_params = { .chain_noise_scale = 1000, .wd_timeout = IWL_DEF_WD_TIMEOUT, .max_event_log_size = 512, - .shadow_reg_enable = true, + .shadow_reg_enable = false, /* TODO: fix bugs using this feature */ };static const struct iwl_base_params iwl6050_base_params = {
@@ -299,7 +299,7 @@ static const struct iwl_base_params iwl6050_base_params = { .chain_noise_scale = 1500, .wd_timeout = IWL_DEF_WD_TIMEOUT, .max_event_log_size = 1024, - .shadow_reg_enable = true, + .shadow_reg_enable = false, /* TODO: fix bugs using this feature */ };static const struct iwl_base_params iwl6000_g2_base_params = {
@@ -316,7 +316,7 @@ static const struct iwl_base_params iwl6000_g2_base_params = { .chain_noise_scale = 1000, .wd_timeout = IWL_LONG_WD_TIMEOUT, .max_event_log_size = 512, - .shadow_reg_enable = true, + .shadow_reg_enable = false, /* TODO: fix bugs using this feature */ };static const struct iwl_ht_params iwl6000_ht_params = {
drivers/net/wireless/iwlwifi/iwl-agn-rs.c +1 -0
@@ -884,6 +884,7 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,if ((priv->bt_traffic_load != priv->last_bt_traffic_load) || (priv->bt_full_concurrent != full_concurrent)) { priv->bt_full_concurrent = full_concurrent; + priv->last_bt_traffic_load = priv->bt_traffic_load;/* Update uCode's rate table. */ tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);
drivers/net/wireless/wl1251/sdio.c +1 -1
@@ -260,6 +260,7 @@ static int wl1251_sdio_probe(struct sdio_func *func, }if (wl->irq) { +irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_line_irq,0 ,"wl1251" , wl);if (ret <0 ) {wl1251_error ("request_irq() failed: %d" , ret);
@@ -267,7 +268,6 @@ static int wl1251_sdio_probe(struct sdio_func *func, }irq_set_irq_type (wl->irq,IRQ_TYPE_EDGE_RISING ); -disable_irq (wl->irq); wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq; wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
drivers/net/wireless/wl1251/spi.c +1 -2
@@ -281,6 +281,7 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi) wl->use_eeprom = pdata->use_eeprom; +irq_set_status_flags (wl->irq,IRQ_NOAUTOEN ); ret =request_irq (wl->irq, wl1251_irq,0 ,DRIVER_NAME , wl);if (ret <0 ) {wl1251_error ("request_irq() failed: %d" , ret);
@@ -289,8 +290,6 @@ static int __devinit wl1251_spi_probe(struct spi_device *spi)irq_set_irq_type (wl->irq,IRQ_TYPE_EDGE_RISING ); -disable_irq (wl->irq); - ret =wl1251_init_ieee80211 (wl);if (ret) goto out_irq;
drivers/scsi/scsi_lib.c +7 -4
@@ -1378,16 +1378,19 @@ static int scsi_lld_busy(struct request_queue *q) {struct scsi_device *sdev = q->queuedata;struct Scsi_Host *shost; -struct scsi_target *starget;if (!sdev)return 0 ; shost = sdev->host; - starget =scsi_target (sdev); -if (scsi_host_in_recovery (shost) ||scsi_host_is_busy (shost) || -scsi_target_is_busy (starget) ||scsi_device_is_busy (sdev)) +/* +* Ignore host/starget busy state. +* Since block layer does not have a concept of fairness across +* multiple queues, congestion of host/starget needs to be handled +* in SCSI layer. +*/ +if (scsi_host_in_recovery (shost) ||scsi_device_is_busy (sdev))return 1 ;return 0 ;
drivers/scsi/scsi_wait_scan.c +1 -1
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/device.h> -#include <scsi/scsi_scan.h> +#include "scsi_priv.h" static int __init wait_scan_init (void ) {
fs/attr.c +5 -0
@@ -176,6 +176,11 @@ int notify_change(struct dentry * dentry, struct iattr * attr)return -EPERM ; } +if ((ia_valid &ATTR_SIZE ) &&IS_I_VERSION (inode)) { +if (attr->ia_size != inode->i_size) +inode_inc_iversion (inode); + } +if ((ia_valid &ATTR_MODE )) {umode_t amode = attr->ia_mode;/* Flag setting protected by i_mutex */
fs/cifs/cifsglob.h +1 -0
@@ -43,6 +43,7 @@#define CIFS_MIN_RCV_POOL 4 +#define MAX_REOPEN_ATT 5/* these many maximum attempts to reopen a file */ /* * default attribute cache timeout (jiffies) */
fs/cifs/cifsproto.h +4 -2
@@ -192,11 +192,13 @@ extern int CIFSTCon(unsigned int xid, struct cifs_ses *ses,extern int CIFSFindFirst (const int xid,struct cifs_tcon *tcon,const char *searchName,const struct nls_table *nls_codepage, -__u16 *searchHandle,struct cifs_search_info *psrch_inf, +__u16 *searchHandle,__u16 search_flags, +struct cifs_search_info *psrch_inf,int map,const char dirsep);extern int CIFSFindNext (const int xid,struct cifs_tcon *tcon, -__u16 searchHandle,struct cifs_search_info *psrch_inf); +__u16 searchHandle,__u16 search_flags, +struct cifs_search_info *psrch_inf);extern int CIFSFindClose (const int ,struct cifs_tcon *tcon,const __u16 search_handle);
fs/cifs/cifssmb.c +5 -7
@@ -4344,7 +4344,7 @@ int CIFSFindFirst(const int xid, struct cifs_tcon *tcon, const char *searchName, const struct nls_table *nls_codepage, - __u16 *pnetfid, + __u16 *pnetfid, __u16 search_flags, struct cifs_search_info *psrch_inf, int remap, const char dirsep) {/* level 257 SMB_ */
@@ -4416,8 +4416,7 @@ findFirstRetry:cpu_to_le16 (ATTR_READONLY |ATTR_HIDDEN |ATTR_SYSTEM |ATTR_DIRECTORY ); pSMB->SearchCount =cpu_to_le16 (CIFSMaxBufSize/sizeof (FILE_UNIX_INFO )); - pSMB->SearchFlags =cpu_to_le16 (CIFS_SEARCH_CLOSE_AT_END | -CIFS_SEARCH_RETURN_RESUME ); + pSMB->SearchFlags =cpu_to_le16 (search_flags); pSMB->InformationLevel =cpu_to_le16 (psrch_inf->info_level);/* BB what should we set StorageType to? Does it matter? BB */
@@ -4487,8 +4486,8 @@ findFirstRetry:return rc; } -int CIFSFindNext (const int xid,struct cifs_tcon *tcon, -__u16 searchHandle,struct cifs_search_info *psrch_inf) +int CIFSFindNext (const int xid,struct cifs_tcon *tcon,__u16 searchHandle, +__u16 search_flags,struct cifs_search_info *psrch_inf) {TRANSACTION2_FNEXT_REQ *pSMB =NULL ;TRANSACTION2_FNEXT_RSP *pSMBr =NULL ;
@@ -4531,8 +4530,7 @@ int CIFSFindNext(const int xid, struct cifs_tcon *tcon,cpu_to_le16 (CIFSMaxBufSize /sizeof (FILE_UNIX_INFO )); pSMB->InformationLevel =cpu_to_le16 (psrch_inf->info_level); pSMB->ResumeKey = psrch_inf->resume_key; - pSMB->SearchFlags = -cpu_to_le16 (CIFS_SEARCH_CLOSE_AT_END |CIFS_SEARCH_RETURN_RESUME ); + pSMB->SearchFlags =cpu_to_le16 (search_flags); name_len = psrch_inf->resume_name_len; params += name_len;
fs/cifs/file.c +33 -24
90 lines not on this page · raw message
fs/cifs/readdir.c +13 -2
@@ -219,6 +219,7 @@ int get_symlink_reparse_path(char *full_path, struct cifs_sb_info *cifs_sb,static int initiate_cifs_search (const int xid,struct file *file) { +__u16 search_flags;int rc =0 ;char *full_path =NULL ;struct cifsFileInfo *cifsFile;
@@ -270,8 +271,12 @@ ffirst_retry: cifsFile->srch_inf.info_level =SMB_FIND_FILE_DIRECTORY_INFO ; } + search_flags =CIFS_SEARCH_CLOSE_AT_END |CIFS_SEARCH_RETURN_RESUME ; +if (backup_cred (cifs_sb)) + search_flags |=CIFS_SEARCH_BACKUP_SEARCH ; + rc =CIFSFindFirst (xid, pTcon, full_path, cifs_sb->local_nls, - &cifsFile->netfid, &cifsFile->srch_inf, + &cifsFile->netfid, search_flags, &cifsFile->srch_inf, cifs_sb->mnt_cifs_flags &CIFS_MOUNT_MAP_SPECIAL_CHR ,CIFS_DIR_SEP (cifs_sb));if (rc ==0 )
@@ -502,11 +507,13 @@ static int cifs_save_resume_key(const char *current_entry,static int find_cifs_entry (const int xid,struct cifs_tcon *pTcon,struct file *file,char **ppCurrentEntry,int *num_to_ret) { +__u16 search_flags;int rc =0 ;int pos_in_buf =0 ;loff_t first_entry_in_buffer;loff_t index_to_find = file->f_pos;struct cifsFileInfo *cifsFile = file->private_data; +struct cifs_sb_info *cifs_sb =CIFS_SB (file->f_path.dentry->d_sb);/* check if index in the buffer */ if ((cifsFile == NULL) || (ppCurrentEntry == NULL) ||
@@ -560,10 +567,14 @@ static int find_cifs_entry(const int xid, struct cifs_tcon *pTcon, cifsFile); } + search_flags =CIFS_SEARCH_CLOSE_AT_END |CIFS_SEARCH_RETURN_RESUME ; +if (backup_cred (cifs_sb)) + search_flags |=CIFS_SEARCH_BACKUP_SEARCH ; +while ((index_to_find >= cifsFile->srch_inf.index_of_last_entry) && (rc ==0 ) && !cifsFile->srch_inf.endOfSearch) {cFYI (1 ,"calling findnext2" ); - rc =CIFSFindNext (xid, pTcon, cifsFile->netfid, + rc =CIFSFindNext (xid, pTcon, cifsFile->netfid, search_flags, &cifsFile->srch_inf);/* FindFirst/Next set last_entry to NULL on malformed reply */ if (cifsFile->srch_inf.last_entry)
fs/exofs/super.c +1 -1
@@ -745,7 +745,6 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) sbi->one_comp.obj.partition = opts->pid; sbi->one_comp.obj.id =0 ;exofs_make_credential (sbi->one_comp.cred, &sbi->one_comp.obj); - sbi->oc.numdevs =1 ; sbi->oc.single_comp =EC_SINGLE_COMP ; sbi->oc.comps = &sbi->one_comp;
@@ -804,6 +803,7 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent) goto free_sbi;ore_comp_set_dev (&sbi->oc,0 , od); + sbi->oc.numdevs =1 ; }__sbi_read_stats (sbi);
fs/ext4/ialloc.c +6 -4
@@ -488,10 +488,12 @@ fallback_retry:for (i =0 ; i < ngroups; i++) { grp = (parent_group + i) % ngroups; desc =ext4_get_group_desc (sb, grp,NULL ); - grp_free =ext4_free_inodes_count (sb, desc); -if (desc && grp_free && grp_free >= avefreei) { - *group = grp; -return 0 ; +if (desc) { + grp_free =ext4_free_inodes_count (sb, desc); +if (grp_free && grp_free >= avefreei) { + *group = grp; +return 0 ; + } } }
fs/ext4/ioctl.c +9 -4
@@ -38,7 +38,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)handle_t *handle =NULL ;int err, migrate =0 ;struct ext4_iloc iloc; -unsigned int oldflags; +unsigned int oldflags, mask, i;unsigned int jflag;if (!inode_owner_or_capable (inode))
@@ -115,9 +115,14 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)if (err) goto flags_err; - flags = flags &EXT4_FL_USER_MODIFIABLE ; - flags |= oldflags & ~EXT4_FL_USER_MODIFIABLE ; - ei->i_flags = flags; +for (i =0 , mask =1 ; i <32 ; i++, mask <<=1 ) { +if (!(mask &EXT4_FL_USER_MODIFIABLE )) +continue ; +if (mask & flags) +ext4_set_inode_flag (inode, i); +else +ext4_clear_inode_flag (inode, i); + }ext4_set_inode_flags (inode); inode->i_ctime =ext4_current_time (inode);
fs/ext4/mballoc.c +4 -2
@@ -2517,6 +2517,9 @@ int ext4_mb_release(struct super_block *sb)struct ext4_sb_info *sbi =EXT4_SB (sb);struct kmem_cache *cachep =get_groupinfo_cache (sb->s_blocksize_bits); +if (sbi->s_proc) +remove_proc_entry ("mb_groups" , sbi->s_proc); +if (sbi->s_group_info) {for (i =0 ; i < ngroups; i++) { grinfo =ext4_get_group_info (sb, i);
@@ -2564,8 +2567,6 @@ int ext4_mb_release(struct super_block *sb) }free_percpu (sbi->s_locality_groups); -if (sbi->s_proc) -remove_proc_entry ("mb_groups" , sbi->s_proc);return 0 ; }
@@ -4636,6 +4637,7 @@ do_more:*/ new_entry =kmem_cache_alloc (ext4_free_data_cachep,GFP_NOFS );if (!new_entry) { +ext4_mb_unload_buddy (&e4b); err = -ENOMEM ; goto error_return; }
fs/ext4/namei.c +6 -0
@@ -1037,6 +1037,12 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, struEXT4_ERROR_INODE (dir,"bad inode number: %u" , ino);return ERR_PTR (-EIO ); } +if (unlikely (ino == dir->i_ino)) { +EXT4_ERROR_INODE (dir,"'%.*s' linked to parent dir" , + dentry->d_name.len, + dentry->d_name.name); +return ERR_PTR (-EIO ); + } inode =ext4_iget (dir->i_sb, ino);if (inode ==ERR_PTR (-ESTALE )) { EXT4_ERROR_INODE(dir,
fs/ext4/resize.c +2 -0
@@ -161,6 +161,8 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned long flexbg_size)if (flex_gd ==NULL ) goto out3; +if (flexbg_size >=UINT_MAX /sizeof (struct ext4_new_flex_group_data )) + goto out2; flex_gd->count = flexbg_size; flex_gd->groups = kmalloc(sizeof(struct ext4_new_group_data) *
fs/ext4/super.c +3 -1
@@ -497,6 +497,7 @@ void __ext4_error(struct super_block *sb, const char *function,printk (KERN_CRIT "EXT4-fs error (device %s): %s:%d: comm %s: %pV\n" , sb->s_id, function, line, current->comm, &vaf);va_end (args); +save_error_info (sb, function, line);ext4_handle_error (sb); }
@@ -3592,7 +3593,8 @@ no_journal: goto failed_mount4; } -ext4_setup_super (sb, es, sb->s_flags &MS_RDONLY ); +if (ext4_setup_super (sb, es, sb->s_flags &MS_RDONLY )) + sb->s_flags |=MS_RDONLY ;/* determine the minimum size of new large inodes, if present */ if (sbi->s_inode_size >EXT4_GOOD_OLD_INODE_SIZE ) {
fs/namespace.c +2 -1
@@ -1073,8 +1073,9 @@ void umount_tree(struct mount *mnt, int propagate, struct list_head *kill)list_del_init (&p->mnt_expire);list_del_init (&p->mnt_list);__touch_mnt_namespace (p->mnt_ns); +if (p->mnt_ns) +__mnt_make_shortterm (p); p->mnt_ns =NULL ; -__mnt_make_shortterm (p);list_del_init (&p->mnt_child);if (mnt_has_parent (p)) { p->mnt_parent->mnt_ghosts++;
fs/nfs/idmap.c +3 -7
@@ -640,20 +640,16 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons,struct idmap_msg *im;struct idmap *idmap = (struct idmap *)aux;struct key *key = cons->key; -int ret; +int ret = -ENOMEM ;/* msg and im are freed in idmap_pipe_destroy_msg */ msg =kmalloc (sizeof (*msg),GFP_KERNEL ); -if (IS_ERR (msg)) { - ret =PTR_ERR (msg); +if (!msg) goto out0; - } im =kmalloc (sizeof (*im),GFP_KERNEL ); -if (IS_ERR (im)) { - ret =PTR_ERR (im); +if (!im) goto out1; - } ret =nfs_idmap_prepare_message (key->description, im, msg);if (ret <0 )
fs/nfs/nfs4proc.c +2 -0
@@ -101,6 +101,8 @@ static int nfs4_map_errors(int err)case -NFS4ERR_BADOWNER :case -NFS4ERR_BADNAME :return -EINVAL ; +case -NFS4ERR_SHARE_DENIED : +return -EACCES ;default :dprintk ("%s could not handle NFSv4 error %d\n" , __func__, -err);
fs/proc/base.c +10 -7
@@ -1803,7 +1803,7 @@ static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd)rcu_read_lock (); file =fcheck_files (files, fd);if (file) { -unsigned i_mode, f_mode = file->f_mode; +unsigned f_mode = file->f_mode;rcu_read_unlock ();put_files_struct (files);
@@ -1819,12 +1819,14 @@ static int tid_fd_revalidate(struct dentry *dentry, struct nameidata *nd) inode->i_gid =0 ; } - i_mode =S_IFLNK ; -if (f_mode &FMODE_READ ) - i_mode |=S_IRUSR |S_IXUSR ; -if (f_mode &FMODE_WRITE ) - i_mode |=S_IWUSR |S_IXUSR ; - inode->i_mode = i_mode; +if (S_ISLNK (inode->i_mode)) { +unsigned i_mode =S_IFLNK ; +if (f_mode &FMODE_READ ) + i_mode |=S_IRUSR |S_IXUSR ; +if (f_mode &FMODE_WRITE ) + i_mode |=S_IWUSR |S_IXUSR ; + inode->i_mode = i_mode; + }security_task_to_inode (task, inode);put_task_struct (task);
@@ -1859,6 +1861,7 @@ static struct dentry *proc_fd_instantiate(struct inode *dir, ei =PROC_I (inode); ei->fd = fd; + inode->i_mode =S_IFLNK ; inode->i_op = &proc_pid_link_inode_operations; inode->i_size =64 ; ei->op.proc_get_link = proc_fd_link;
fs/proc/task_mmu.c +1 -1
@@ -784,7 +784,7 @@ static int pagemap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,/* find the first VMA at or above 'addr' */ vma =find_vma (walk->mm, addr); -if (pmd_trans_huge_lock (pmd, vma) ==1 ) { +if (vma &&pmd_trans_huge_lock (pmd, vma) ==1 ) {for (; addr != end; addr +=PAGE_SIZE ) {unsigned long offset;
include/drm/drm_pciids.h +15 -2
@@ -181,6 +181,7 @@ {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x674A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
@@ -198,6 +199,7 @@ {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6770, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6771, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
@@ -229,10 +231,11 @@ {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ - {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ - {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
@@ -531,6 +534,7 @@ {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ {0x1002, 0x9648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ + {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x964c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -550,6 +554,7 @@ {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x980A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -561,11 +566,19 @@ {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9910, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9913, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9917, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9918, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0, 0, 0} #define r128_PCI_IDS \
include/linux/Kbuild +1 -0
@@ -227,6 +227,7 @@ header-y += kd.h header-y += kdev_t.h header-y += kernel.h header-y += kernelcapi.h +header-y += kernel-page-flags.h header-y += keyboard.h header-y += keyctl.h header-y += l2tp.h
include/linux/kernel-page-flags.h +4 -0
@@ -32,6 +32,8 @@#define KPF_KSM 21#define KPF_THP 22 +#ifdef __KERNEL__ +/* kernel hacking assistances * WARNING: subject to change, never rely on them! */
@@ -44,4 +46,6 @@#define KPF_ARCH 38#define KPF_UNCACHED 39 +#endif /* __KERNEL__ */ +#endif /* LINUX_KERNEL_PAGE_FLAGS_H */
include/linux/radix-tree.h +4 -1
@@ -368,8 +368,11 @@ radix_tree_next_slot(void **slot, struct radix_tree_iter *iter, unsigned flags) iter->index++;if (likely (*slot))return slot; -if (flags &RADIX_TREE_ITER_CONTIG ) +if (flags &RADIX_TREE_ITER_CONTIG ) { +/* forbid switching to the next chunk */ + iter->next_index =0 ;break ; + } } }return NULL ;
include/linux/skbuff.h +0 -2
@@ -1881,8 +1881,6 @@ static inline int __skb_cow(struct sk_buff *skb, unsigned int headroom, {int delta =0 ; -if (headroom <NET_SKB_PAD ) - headroom =NET_SKB_PAD ;if (headroom >skb_headroom (skb)) delta = headroom -skb_headroom (skb);
include/net/dst.h +1 -0
@@ -60,6 +60,7 @@ struct dst_entry {#define DST_NOCOUNT 0x0020#define DST_NOPEER 0x0040#define DST_FAKE_RTABLE 0x0080 +#define DST_XFRM_TUNNEL 0x0100short error;short obsolete;
kernel/fork.c +2 -1
@@ -356,7 +356,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) } charge =0 ;if (mpnt->vm_flags &VM_ACCOUNT ) { -unsigned int len = (mpnt->vm_end - mpnt->vm_start) >>PAGE_SHIFT ; +unsigned long len; + len = (mpnt->vm_end - mpnt->vm_start) >>PAGE_SHIFT ;if (security_vm_enough_memory_mm (oldmm, len))/* sic */ goto fail_nomem; charge = len;
lib/radix-tree.c +3 -0
@@ -673,6 +673,9 @@ void **radix_tree_next_chunk(struct radix_tree_root *root,* during iterating; it can be zero only at the beginning. * And we cannot overflow iter->next_index in a single step, * because RADIX_TREE_MAP_SHIFT < BITS_PER_LONG. +* +* This condition also used by radix_tree_next_slot() to stop +* contiguous iterating, and forbid swithing to the next chunk. */ index = iter->next_index;if (!index && iter->index)
mm/hugetlb.c +23 -6
@@ -2157,6 +2157,15 @@ static void hugetlb_vm_op_open(struct vm_area_struct *vma)kref_get (&reservations->refs); } +static void resv_map_put (struct vm_area_struct *vma) +{ +struct resv_map *reservations =vma_resv_map (vma); + +if (!reservations) +return ; +kref_put (&reservations->refs, resv_map_release); +} +static void hugetlb_vm_op_close (struct vm_area_struct *vma) {struct hstate *h =hstate_vma (vma);
@@ -2173,7 +2182,7 @@ static void hugetlb_vm_op_close(struct vm_area_struct *vma) reserve = (end - start) -region_count (&reservations->regions, start, end); -kref_put (&reservations->refs, resv_map_release); +resv_map_put (vma);if (reserve) {hugetlb_acct_memory (h, -reserve);
@@ -2990,12 +2999,16 @@ int hugetlb_reserve_pages(struct inode *inode,set_vma_resv_flags (vma,HPAGE_RESV_OWNER ); } -if (chg <0 ) -return chg; +if (chg <0 ) { + ret = chg; + goto out_err; + }/* There must be enough pages in the subpool for the mapping */ -if (hugepage_subpool_get_pages (spool, chg)) -return -ENOSPC ; +if (hugepage_subpool_get_pages (spool, chg)) { + ret = -ENOSPC ; + goto out_err; + }/* * Check enough hugepages are available for the reservation.
@@ -3004,7 +3017,7 @@ int hugetlb_reserve_pages(struct inode *inode, ret =hugetlb_acct_memory (h, chg);if (ret <0 ) {hugepage_subpool_put_pages (spool, chg); -return ret; + goto out_err; }/*
@@ -3021,6 +3034,10 @@ int hugetlb_reserve_pages(struct inode *inode,if (!vma || vma->vm_flags &VM_MAYSHARE )region_add (&inode->i_mapping->private_list, from, to);return 0 ; +out_err: +if (vma) +resv_map_put (vma); +return ret; }void hugetlb_unreserve_pages (struct inode *inode,long offset,long freed)
mm/slub.c +6 -3
@@ -1514,15 +1514,19 @@ static inline void *acquire_slab(struct kmem_cache *s, freelist = page->freelist; counters = page->counters; new.counters = counters; -if (mode) +if (mode) { new.inuse = page->objects; + new.freelist =NULL ; + }else { + new.freelist = freelist; + }VM_BUG_ON (new.frozen); new.frozen =1 ; }while (!__cmpxchg_double_slab (s, page, freelist, counters, -NULL , new.counters, + new.freelist, new.counters,"lock and freeze" ));remove_partial (n, page);
@@ -1564,7 +1568,6 @@ static void *get_partial_node(struct kmem_cache *s, object = t; available = page->objects - page->inuse; }else { - page->freelist = t; available =put_cpu_partial (s, page,0 );stat (s,CPU_PARTIAL_NODE ); }
mm/vmalloc.c +2 -1
@@ -1185,9 +1185,10 @@ void __init vmalloc_init(void)/* Import existing vmlist entries. */ for (tmp = vmlist; tmp; tmp = tmp->next) { va =kzalloc (sizeof (struct vmap_area ),GFP_NOWAIT ); - va->flags = tmp->flags |VM_VM_AREA ; + va->flags =VM_VM_AREA ; va->va_start = (unsigned long )tmp->addr; va->va_end = va->va_start + tmp->size; + va->vm = tmp;__insert_vmap_area (va); }
mm/vmscan.c +1 -1
@@ -722,7 +722,7 @@ static enum page_references page_check_references(struct page *page,return PAGEREF_RECLAIM ;if (referenced_ptes) { -if (PageAnon (page)) +if (PageSwapBacked (page))return PAGEREF_ACTIVATE ;/* * All mapped pages start out with page table
net/ipv4/esp4.c +9 -15
@@ -459,28 +459,22 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)struct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 );u32 align =max_t (u32, blksize, esp->padlen); -u32 rem; - - mtu -= x->props.header_len +crypto_aead_authsize (esp->aead); - rem = mtu & (align -1 ); - mtu &= ~(align -1 ); +unsigned int net_adj;switch (x->props.mode) { -case XFRM_MODE_TUNNEL : -break ; -default :case XFRM_MODE_TRANSPORT : -/* The worst case */ - mtu -= blksize -4 ; - mtu +=min_t (u32, blksize -4 , rem); -break ;case XFRM_MODE_BEET : -/* The worst case. */ - mtu +=min_t (u32,IPV4_BEET_PHMAXLEN , rem); + net_adj =sizeof (struct iphdr );break ; +case XFRM_MODE_TUNNEL : + net_adj =0 ; +break ; +default : +BUG (); } -return mtu -2 ; +return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - + net_adj) & ~(align -1 )) + (net_adj -2 ); }static void esp4_err (struct sk_buff *skb,u32 info)
net/ipv4/fib_semantics.c +6 -6
@@ -145,6 +145,12 @@ static void free_fib_info_rcu(struct rcu_head *head) { struct fib_info *fi = container_of(head, struct fib_info, rcu); +change_nexthops (fi) { +if (nexthop_nh->nh_dev) +dev_put (nexthop_nh->nh_dev); + }endfor_nexthops (fi); + +release_net (fi->fib_net);if (fi->fib_metrics != (u32 *) dst_default_metrics)kfree (fi->fib_metrics);kfree (fi);
@@ -156,13 +162,7 @@ void free_fib_info(struct fib_info *fi)pr_warn ("Freeing alive fib_info %p\n" , fi);return ; } -change_nexthops (fi) { -if (nexthop_nh->nh_dev) -dev_put (nexthop_nh->nh_dev); - nexthop_nh->nh_dev =NULL ; - }endfor_nexthops (fi); fib_info_cnt--; -release_net (fi->fib_net);call_rcu (&fi->rcu, free_fib_info_rcu); }
net/ipv6/esp6.c +7 -11
@@ -411,19 +411,15 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)struct esp_data *esp = x->data;u32 blksize =ALIGN (crypto_aead_blocksize (esp->aead),4 );u32 align =max_t (u32, blksize, esp->padlen); -u32 rem; +unsigned int net_adj; - mtu -= x->props.header_len +crypto_aead_authsize (esp->aead); - rem = mtu & (align -1 ); - mtu &= ~(align -1 ); - -if (x->props.mode !=XFRM_MODE_TUNNEL ) { -u32 padsize = ((blksize -1 ) &7 ) +1 ; - mtu -= blksize - padsize; - mtu +=min_t (u32, blksize - padsize, rem); - } +if (x->props.mode !=XFRM_MODE_TUNNEL ) + net_adj =sizeof (struct ipv6hdr ); +else + net_adj =0 ; -return mtu -2 ; +return ((mtu - x->props.header_len -crypto_aead_authsize (esp->aead) - + net_adj) & ~(align -1 )) + (net_adj -2 ); } static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
net/ipv6/ip6_output.c +50 -18
109 lines not on this page · raw message
net/l2tp/l2tp_ip.c +24 -6
@@ -251,9 +251,16 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len) {struct inet_sock *inet =inet_sk (sk);struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *) uaddr; -int ret = -EINVAL ; +int ret;int chk_addr_ret; +if (!sock_flag (sk,SOCK_ZAPPED )) +return -EINVAL ; +if (addr_len <sizeof (struct sockaddr_l2tpip )) +return -EINVAL ; +if (addr->l2tp_family !=AF_INET ) +return -EINVAL ; + ret = -EADDRINUSE ;read_lock_bh (&l2tp_ip_lock);if (__l2tp_ip_bind_lookup (&init_net, addr->l2tp_addr.s_addr, sk->sk_bound_dev_if, addr->l2tp_conn_id))
@@ -284,6 +291,8 @@ static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)sk_del_node_init (sk);write_unlock_bh (&l2tp_ip_lock); ret =0 ; +sock_reset_flag (sk,SOCK_ZAPPED ); + out:release_sock (sk);
@@ -304,13 +313,14 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len__be32 saddr;int oif, rc; - rc = -EINVAL ; +if (sock_flag (sk,SOCK_ZAPPED ))/* Must bind first - autobinding does not work */ +return -EINVAL ; +if (addr_len <sizeof (*lsa)) - goto out; +return -EINVAL ; - rc = -EAFNOSUPPORT ;if (lsa->l2tp_family !=AF_INET ) - goto out; +return -EAFNOSUPPORT ;lock_sock (sk);
@@ -364,6 +374,14 @@ out:return rc; } +static int l2tp_ip_disconnect (struct sock *sk,int flags) +{ +if (sock_flag (sk,SOCK_ZAPPED )) +return 0 ; + +return udp_disconnect (sk, flags); +} +static int l2tp_ip_getname (struct socket *sock,struct sockaddr *uaddr,int *uaddr_len,int peer) {
@@ -599,7 +617,7 @@ static struct proto l2tp_ip_prot = { .close = l2tp_ip_close, .bind = l2tp_ip_bind, .connect = l2tp_ip_connect, - .disconnect = udp_disconnect, + .disconnect = l2tp_ip_disconnect, .ioctl = udp_ioctl, .destroy = l2tp_ip_destroy_sock, .setsockopt = ip_setsockopt,
net/mac80211/util.c +6 -6
@@ -1321,6 +1321,12 @@ int ieee80211_reconfig(struct ieee80211_local *local) } } +/* add back keys */ +list_for_each_entry (sdata, &local->interfaces, list) +if (ieee80211_sdata_running (sdata)) +ieee80211_enable_keys (sdata); + + wake_up:/* * Clear the WLAN_STA_BLOCK_BA flag so new aggregation * sessions can be established after a resume.
@@ -1342,12 +1348,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)mutex_unlock (&local->sta_mtx); } -/* add back keys */ -list_for_each_entry (sdata, &local->interfaces, list) -if (ieee80211_sdata_running (sdata)) -ieee80211_enable_keys (sdata); - - wake_up:ieee80211_wake_queues_by_reason (hw,IEEE80211_QUEUE_STOP_REASON_SUSPEND );
net/sunrpc/clnt.c +2 -0
@@ -1288,6 +1288,8 @@ call_reserveresult(struct rpc_task *task) }switch (status) { +case -ENOMEM : +rpc_delay (task,HZ >>2 );case -EAGAIN :/* woken up; retry */ task->tk_action = call_reserve;return ;
net/sunrpc/xprt.c +3 -2
@@ -984,15 +984,16 @@ static void xprt_alloc_slot(struct rpc_task *task) goto out_init_req;switch (PTR_ERR (req)) {case -ENOMEM : -rpc_delay (task,HZ >>2 );dprintk ("RPC: dynamic allocation of request slot " "failed! Retrying\n" ); + task->tk_status = -ENOMEM ;break ;case -EAGAIN :rpc_sleep_on (&xprt->backlog, task,NULL );dprintk ("RPC: waiting for request slot\n" ); +default : + task->tk_status = -EAGAIN ; } - task->tk_status = -EAGAIN ;return ; out_init_req: task->tk_status =0 ;
net/xfrm/xfrm_policy.c +3 -0
@@ -1919,6 +1919,9 @@ no_transform: } ok:xfrm_pols_put (pols, drop_pols); +if (dst && dst->xfrm && + dst->xfrm->props.mode ==XFRM_MODE_TUNNEL ) + dst->flags |=DST_XFRM_TUNNEL ;return dst; nopol:
sound/usb/pcm.c +3 -0
@@ -699,6 +699,9 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,int count =0 , needs_knot =0 ;int err; +kfree (subs->rate_list.list); + subs->rate_list.list =NULL ; +list_for_each_entry (fp, &subs->fmt_list, list) {if (fp->rates &SNDRV_PCM_RATE_CONTINUOUS )return 0 ;
tools/vm/page-types.c +1 -27
@@ -35,6 +35,7 @@#include <sys/mount.h> #include <sys/statfs.h> #include "../../include/linux/magic.h" +#include "../../include/linux/kernel-page-flags.h" #ifndef MAX_PATH
@@ -73,33 +74,6 @@#define KPF_BYTES 8#define PROC_KPAGEFLAGS "/proc/kpageflags" -/* copied from kpageflags_read() */ -#define KPF_LOCKED 0 -#define KPF_ERROR 1 -#define KPF_REFERENCED 2 -#define KPF_UPTODATE 3 -#define KPF_DIRTY 4 -#define KPF_LRU 5 -#define KPF_ACTIVE 6 -#define KPF_SLAB 7 -#define KPF_WRITEBACK 8 -#define KPF_RECLAIM 9 -#define KPF_BUDDY 10 - -/* [11-20] new additions in 2.6.31 */ -#define KPF_MMAP 11 -#define KPF_ANON 12 -#define KPF_SWAPCACHE 13 -#define KPF_SWAPBACKED 14 -#define KPF_COMPOUND_HEAD 15 -#define KPF_COMPOUND_TAIL 16 -#define KPF_HUGE 17 -#define KPF_UNEVICTABLE 18 -#define KPF_HWPOISON 19 -#define KPF_NOPAGE 20 -#define KPF_KSM 21 -#define KPF_THP 22 -/* [32-] kernel hacking assistances */ #define KPF_RESERVED 32#define KPF_MLOCKED 33