1. 07 Dec, 2006 40 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · ea14fad0
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
        [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
        [ARM] 4001/1: S3C24XX: shorten reboot time
        [ARM] 3983/2: remove unused argument to __bug()
        [ARM] 4000/1: Osiris: add third serial port in
        [ARM] 3999/1: RX3715: suspend to RAM support
        [ARM] 3998/1: VR1000: LED platform devices
        [ARM] 3995/1: iop13xx: add iop13xx support
        [ARM] 3968/1: iop13xx: add iop13xx_defconfig
        [ARM] Update mach-types
        [ARM] Allow gcc to optimise arm_add_memory a little more
        [ARM] 3991/1: i.MX/MX1 high resolution time source
        [ARM] 3990/1: i.MX/MX1 more precise PLL decode
        [ARM] 3986/1: H1940: suspend to RAM support
        [ARM] 3985/1: ixp4xx clocksource cleanup
        [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
        [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
        [ARM] 3981/1: sched_clock for PXA2xx
        [ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
        [ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
        [ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
        ...
      ea14fad0
    • Linus Torvalds's avatar
      Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 · 6ee7e78e
      Linus Torvalds authored
      * 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] replace kmalloc+memset with kzalloc
        [IA64] resolve name clash by renaming is_available_memory()
        [IA64] Need export for csum_ipv6_magic
        [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP
        [PATCH] Add support for type argument in PAL_GET_PSTATE
        [IA64] tidy up return value of ip_fast_csum
        [IA64] implement csum_ipv6_magic for ia64.
        [IA64] More Itanium PAL spec updates
        [IA64] Update processor_info features
        [IA64] Add se bit to Processor State Parameter structure
        [IA64] Add dp bit to cache and bus check structs
        [IA64] SN: Correctly update smp_affinty mask
        [IA64] sparse cleanups
        [IA64] IA64 Kexec/kdump
      6ee7e78e
    • Russell King's avatar
      [ARM] Merge individual ARM sub-trees · 6705cda2
      Russell King authored
      Merge:
       Atmel AT91RM9200 and AT91SAM9260 changes
       General ARM developments
       Disconfiguous memory cleanups
       64-bit/32-bit division and sched_clock extension patches
       EP93xx support changes
       IOP support changes
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      6705cda2
    • Linus Torvalds's avatar
      Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · 7f3af60e
      Linus Torvalds authored
      * 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit
      7f3af60e
    • Ben Dooks's avatar
      [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked · d4f3e084
      Ben Dooks authored
      Do not bother masking/unmasking the parent IRQ
      for the mulitplexed EINT irqs, as masking the
      leaf seems to be fine.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d4f3e084
    • Ben Dooks's avatar
      [ARM] 4001/1: S3C24XX: shorten reboot time · 32d2deea
      Ben Dooks authored
      Cut down the time between requesting a reboot
      and actually getting the reboot to happen by
      a quarter.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      32d2deea
    • Jeff Garzik's avatar
      PCI MSI: always toggle legacy-INTx-enable bit upon MSI entry/exit · 1769b46a
      Jeff Garzik authored
      The current code (prior to this change) would disable the PCI INTx
      legacy interrupt when enabling MSI... but only on PCI Express.  We
      should do this for all MSI devices, for safety's sake.
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      1769b46a
    • Nicolas Pitre's avatar
      [ARM] 3983/2: remove unused argument to __bug() · 7174d852
      Nicolas Pitre authored
      It appears that include/asm-arm/bug.h requires include/linux/stddef.h
      for the definition of NULL. It seems that stddef.h was always included
      indirectly in most cases, and that issue was properly fixed a while ago.
      
      Then commit 5047f09b incorrectly reverted
      change from commit ff10952a (bad dwmw2)
      and the problem recently resurfaced.
      
      Because the third argument to __bug() is never used anyway, RMK suggested
      getting rid of it entirely instead of readding #include <linux/stddef.h>
      which this patch does.
      Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      7174d852
    • Ben Dooks's avatar
      [ARM] 4000/1: Osiris: add third serial port in · ca7aa4de
      Ben Dooks authored
      Add the mapping for the third S3C2440 serial
      port into the default serial devices for the
      Osiris.
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      ca7aa4de
    • Ben Dooks's avatar
      [ARM] 3999/1: RX3715: suspend to RAM support · bbf6f280
      Ben Dooks authored
      The RX3715 is similar to the H1940 in the way
      that suspend to RAM works, so we can use most
      of the extant support for the H1940 with only
      a few modifictions
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      bbf6f280
    • Ben Dooks's avatar
      [ARM] 3998/1: VR1000: LED platform devices · b2eba6bb
      Ben Dooks authored
      Support for the GPIO attached LEDs on the VR1000
      Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      b2eba6bb
    • Yan Burman's avatar
      [IA64] replace kmalloc+memset with kzalloc · 52fd9108
      Yan Burman authored
      Replace kmalloc+memset with kzalloc
      Signed-off-by: default avatarYan Burman <burman.yan@gmail.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      52fd9108
    • Christoph Lameter's avatar
      [IA64] resolve name clash by renaming is_available_memory() · 66888a6e
      Christoph Lameter authored
      There is a name clash with ia64 arch code in Andrew's tree. Rename
      is_avialable_memory() to is_memory_available() to avoid the clash.
      Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      66888a6e
    • Trond Myklebust's avatar
    • Tony Luck's avatar
      [IA64] Need export for csum_ipv6_magic · a5f8ee02
      Tony Luck authored
      Now we have our own highly optimized assembly code version of
      this routine (Thanks Ken!) we should export it so that it can
      be used.
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      a5f8ee02
    • Trond Myklebust's avatar
      Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus · 34161db6
      Trond Myklebust authored
      Conflicts:
      
      	include/linux/sunrpc/xprt.h
      	net/sunrpc/xprtsock.c
      Fix up conflicts with the workqueue changes.
      34161db6
    • Matthew Wilcox's avatar
      [IA64] Fix DISCONTIGMEM without VIRTUAL_MEM_MAP · b0f40ea0
      Matthew Wilcox authored
      make allnoconfig currently fails to build because it selects DISCONTIGMEM
      without VIRTUAL_MEM_MAP.  I see no particular reason this combination
      ought to fail, so I fixed it by:
      
       - Including memory_model.h in all circumstances, except when both
         DISCONTIGMEM and VIRTUAL_MEM_MAP are enabled.
       - Defining ia64_pfn_valid() to 1 unless VIRTUAL_MEM_MAP is enabled
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      b0f40ea0
    • Venkatesh Pallipadi's avatar
      [PATCH] Add support for type argument in PAL_GET_PSTATE · 17e77b1c
      Venkatesh Pallipadi authored
      PAL_GET_PSTATE accepts a type argument to return different kinds of
      frequency information.
      Refer: Intel Itanium®Architecture Software Developer's Manual -
      Volume 2: System Architecture, Revision 2.2
      (http://developer.intel.com/design/itanium/manuals/245318.htm)
      
      Add the support for type argument and use Instantaneous frequency
      in the acpi driver.
      
      Also fix a bug, where in return value of PAL_GET_PSTATE was getting compared
      with 'control' bits instead of 'status' bits.
      Signed-off-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      17e77b1c
    • Chen, Kenneth W's avatar
      [IA64] tidy up return value of ip_fast_csum · 6dbfc19b
      Chen, Kenneth W authored
      While working on implementing csum_ipv6_magic, I noticed that current
      version of ip_fast_csum will potentially return bits above "unsigned
      short" as 1.  While no harm is done right now because all call sites
      will chop off the upper bits when it uses the return value.  However,
      this is still dangerous and buggy.  Here is a patch to enforce that the
      function really returns unsigned short in the native register format.
      
      The fix is free as there are plenty open slot to add one more asm instruction.
      Signed-off-by: default avatarKen Chen <kenneth.w.chen@intel.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      6dbfc19b
    • Chen, Kenneth W's avatar
      [IA64] implement csum_ipv6_magic for ia64. · 007d77d0
      Chen, Kenneth W authored
      The asm version is 4.4 times faster than the generic C version and
      10X smaller in code size.
      Signed-off-by: default avatarKen Chen <kenneth.w.chen@intel.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      007d77d0
    • Russ Anderson's avatar
      [IA64] More Itanium PAL spec updates · 5b4d5681
      Russ Anderson authored
      Additional updates to conform with Rev 2.2 of Volume 2 of "Intel
      Itanium Architecture Software Developer's Manual" (January 2006).
      
      Add pal_bus_features_s bits 52 & 53 (page 2:347)
      Add pal_vm_info_2_s field max_purges (page 2:2:451)
      Add PAL_GET_HW_POLICY call (page 2:381)
      Add PAL_SET_HW_POLICY call (page 2:439)
      
      Sample output before:
      ---------------------------------------------------------------------
      cobra:~ # cat /proc/pal/cpu0/vm_info
      Physical Address Space         : 50 bits
      Virtual Address Space          : 61 bits
      Protection Key Registers(PKR)  : 16
      Implemented bits in PKR.key    : 24
      Hash Tag ID                    : 0x2
      Size of RR.rid                 : 24
      Supported memory attributes    : WB, UC, UCE, WC, NaTPage
      ---------------------------------------------------------------------
      
      Sample output after:
      ---------------------------------------------------------------------
      cobra:~ # cat /proc/pal/cpu0/vm_info
      Physical Address Space         : 50 bits
      Virtual Address Space          : 61 bits
      Protection Key Registers(PKR)  : 16
      Implemented bits in PKR.key    : 24
      Hash Tag ID                    : 0x2
      Max Purges                     : 1
      Size of RR.rid                 : 24
      Supported memory attributes    : WB, UC, UCE, WC, NaTPage
      ---------------------------------------------------------------------
      
      Signed-off-by: Russ Anderson (rja@sgi.com)
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      5b4d5681
    • Russ Anderson's avatar
      [IA64] Update processor_info features · 895309ff
      Russ Anderson authored
      Add the printing of additional processor features to proc_features.
      
      Based on Rev 2.2 of Volume 2 of "Intel Itanium Architecture Software
      Developer's Manual" (January 2006) fields (pages 2:430-2:432).
      This patch gets the features back in sync with the spec.
      
      Sample output before:
      --------------------------------------------------------------
      cobra:~ # cat /proc/pal/cpu0/processor_info
      XIP,XPSR,XFS implemented                 : On NoCtrl
      XR1-XR3 implemented                      : On NoCtrl
      Disable dynamic predicate prediction     : NotImpl
      Disable processor physical number        : NotImpl
      Disable dynamic data cache prefetch      : NotImpl
      Disable dynamic inst cache prefetch      : NotImpl
      Disable dynamic branch prediction        : NotImpl
      Disable BINIT on processor time-out      : On Ctrl
      Disable dynamic power management (DPM)   : NotImpl
      Disable coherency                        : NotImpl
      Disable cache                            : NotImpl
      Enable CMCI promotion                    : Off Ctrl
      Enable MCA to BINIT promotion            : Off Ctrl
      Enable MCA promotion                     : NotImpl
      Enable BERR promotion                    : NotImpl
      cobra:~ #
      --------------------------------------------------------------
      
      Sample output after:
      --------------------------------------------------------------
      cobra:~ # cat /proc/pal/cpu0/processor_info
      Unimplemented instruction address fault  : NotImpl
      INIT, PMI, and LINT pins                 : NotImpl
      Simple unimplimented instr addresses     : On NoCtrl
      Variable P-state performance             : NotImpl
      Virtual machine features implemeted      : On NoCtrl
      XIP,XPSR,XFS implemented                 : On NoCtrl
      XR1-XR3 implemented                      : On NoCtrl
      Disable dynamic predicate prediction     : NotImpl
      Disable processor physical number        : NotImpl
      Disable dynamic data cache prefetch      : NotImpl
      Disable dynamic inst cache prefetch      : NotImpl
      Disable dynamic branch prediction        : NotImpl
      Disable P-states                         : Off Ctrl
      Enable MCA on Data Poisoning             : Off Ctrl
      Enable vmsw instruction                  : On Ctrl
      Enable extern environmental notification : NotImpl
      Disable BINIT on processor time-out      : On Ctrl
      Disable dynamic power management (DPM)   : NotImpl
      Disable coherency                        : NotImpl
      Disable cache                            : NotImpl
      Enable CMCI promotion                    : Off Ctrl
      Enable MCA to BINIT promotion            : Off Ctrl
      Enable MCA promotion                     : NotImpl
      Enable BERR promotion                    : NotImpl
      cobra:~ #
      --------------------------------------------------------------
      
      Signed-off-by: Russ Anderson (rja@sgi.com)
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      895309ff
    • Russ Anderson's avatar
      [IA64] Add se bit to Processor State Parameter structure · 6533bded
      Russ Anderson authored
      Rev 2.2 of Volume 2 of "Intel Itanium Architecture Software Developer's
      Manual" (January 2006) adds a se bit to the Processor State Parameter
      fields (pages 2:299).  This patch gets the structs back in sync
      with the spec.
      
      Signed-off-by: Russ Anderson (rja@sgi.com)
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      6533bded
    • Russ Anderson's avatar
      [IA64] Add dp bit to cache and bus check structs · 323cbb09
      Russ Anderson authored
      Rev 2.2 of Volume 2 of "Intel Itanium Architecture Software Developer's
      Manual" (January 2006) adds a dp bit to the cache_check and bus_check
      fields (pages 2:401-2:404).  This patch gets the structs back in sync
      with the spec.
      
      Signed-off-by: Russ Anderson (rja@sgi.com)
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      323cbb09
    • John Keller's avatar
      [IA64] SN: Correctly update smp_affinty mask · c6957771
      John Keller authored
      On Altix systems, the /proc/irq/nn/smp_affinity mask is not being setup
      at device iniitalization, or updated after an interrupt redirection.
      This patch resolves those issues.
      Signed-off-by: default avatarJohn Keller <jpk@sgi.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      c6957771
    • Matthew Wilcox's avatar
      [IA64] sparse cleanups · d61b49c1
      Matthew Wilcox authored
      0/NULL confusion and some missing UL on constants.
      Signed-off-by: default avatarMatthew Wilcox <matthew@wil.cx>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      d61b49c1
    • Zou Nan hai's avatar
      [IA64] IA64 Kexec/kdump · a7956113
      Zou Nan hai authored
      Changes and updates.
      
      1. Remove fake rendz path and related code according to discuss with Khalid Aziz.
      2. fc.i offset fix in relocate_kernel.S.
      3. iospic shutdown code eoi and mask race fix from Fujitsu.
      4. Warm boot hook in machine_kexec to SN SAL code from Jack Steiner.
      5. Send slave to SAL slave loop patch from Jay Lan.
      6. Kdump on non-recoverable MCA event patch from Jay Lan
      7. Use CTL_UNNUMBERED in kdump_on_init sysctl.
      Signed-off-by: default avatarZou Nan hai <nanhai.zou@intel.com>
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      a7956113
    • Linus Torvalds's avatar
      Add "run_scheduled_work()" workqueue function · 68380b58
      Linus Torvalds authored
      This allows workqueue users to run just their own pending work, rather
      than wait for the whole workqueue to finish running.  This solves the
      deadlock with networking libphy that was due to other workqueue entries
      possibly needing a lock that was held by the routine that wanted to
      flush its own work.
      
      It's not wonderful: if you absolutely need to synchronize with the work
      function having been executed, any user strictly speaking should have
      its own completion tracking logic, since when we run things explicitly
      by hand, the generic workqueue layer can no longer help us synchronize.
      
      Also, this is strictly only usable for work that has been scheduled
      without any delayed timers.  You can not mix the new interface with
      schedule_delayed_work().
      
      But it's better than what we had currently.
      Acked-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      68380b58
    • Dan Williams's avatar
      [ARM] 3995/1: iop13xx: add iop13xx support · 285f5fa7
      Dan Williams authored
      The iop348 processor integrates an Xscale (XSC3 512KB L2 Cache) core with a
      Serial Attached SCSI (SAS) controller, multi-ported DDR2 memory
      controller, 3 Application Direct Memory Access (DMA) controllers, a 133Mhz
      PCI-X interface, a x8 PCI-Express interface, and other peripherals to form
      a system-on-a-chip RAID subsystem engine.
      
      The iop342 processor replaces the SAS controller with a second Xscale core
      for dual core embedded applications.
      
      The iop341 processor is the single core version of iop342.
      
      This patch supports the two Intel customer reference platforms iq81340mc
      for external storage and iq81340sc for direct attach (HBA) development.
      
      The developer's manual is available here:
      ftp://download.intel.com/design/iio/docs/31503701.pdf
      
      Changelog:
      * removed virtual addresses from resource definitions
      * cleaned up some unnecessary #include's
      Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      285f5fa7
    • Dan Williams's avatar
    • Russell King's avatar
      [ARM] Update mach-types · c324113f
      Russell King authored
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      c324113f
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 2fd8507d
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] libata: Incorrect timing computation for PIO5/6
        [PATCH] sata_promise: new EH conversion, take 2
        [PATCH] libata: let ATA_FLAG_PIO_POLLING use polling pio for ATA_PROT_NODATA
        [PATCH] sata_promise: cleanups, take 2
      2fd8507d
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 1c1afa3c
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: (73 commits)
        [DLM] Clean up lowcomms
        [GFS2] Change gfs2_fsync() to use write_inode_now()
        [GFS2] Fix indent in recovery.c
        [GFS2] Don't flush everything on fdatasync
        [GFS2] Add a comment about reading the super block
        [GFS2] Mount problem with the GFS2 code
        [GFS2] Remove gfs2_check_acl()
        [DLM] fix format warnings in rcom.c and recoverd.c
        [GFS2] lock function parameter
        [DLM] don't accept replies to old recovery messages
        [DLM] fix size of STATUS_REPLY message
        [GFS2] fs/gfs2/log.c:log_bmap() fix printk format warning
        [DLM] fix add_requestqueue checking nodes list
        [GFS2] Fix recursive locking in gfs2_getattr
        [GFS2] Fix recursive locking in gfs2_permission
        [GFS2] Reduce number of arguments to meta_io.c:getbuf()
        [GFS2] Move gfs2_meta_syncfs() into log.c
        [GFS2] Fix journal flush problem
        [GFS2] mark_inode_dirty after write to stuffed file
        [GFS2] Fix glock ordering on inode creation
        ...
      1c1afa3c
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 0a01707b
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (43 commits)
        [wireless] zd1211rw: workqueue-related build fixes
        [netdrvr] netxen: workqueue-related build fixes
        [PATCH] sky2: sparse warnings
        [PATCH] skge: fix sparse warnings
        [PATCH] myri10ge: write as 2 32-byte blocks in myri10ge_submit_8rx
        [PATCH] sky2: receive queue watermark tweak
        [PATCH] sky2: beter ram buffer partitioning
        [PATCH] sky2: add comments to PCI ids
        [PATCH] sky2: add PCI for 88ec033
        [PATCH] AT91RM9200 Ethernet: Use dev_alloc_skb()
        [PATCH] AT91RM9200 Ethernet: Add netpoll / netconsole support
        [PATCH] AT91RM9200 Ethernet: Move check_timer variable and use mod_timer()
        [PATCH] AT91RM9200 Ethernet: Remove 'at91_dev' and use netdev_priv()
        [PATCH] ipw2200: Fix debug output endian issue
        [PATCH] ipw2200: Fix a typo
        [PATCH] ipw2200: Update version stamp to 1.2.0
        [PATCH] ipw2200: Add IEEE80211_RADIOTAP_TSFT for promiscuous mode
        [PATCH] softmac: fix unbalanced mutex_lock/unlock in ieee80211softmac_wx_set_mlme
        [PATCH] softmac: Fixed handling of deassociation from AP
        [PATCH] ipw2200: replace kmalloc+memset with kcalloc
        ...
      0a01707b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 2685b267
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (48 commits)
        [NETFILTER]: Fix non-ANSI func. decl.
        [TG3]: Identify Serdes devices more clearly.
        [TG3]: Use msleep.
        [TG3]: Use netif_msg_*.
        [TG3]: Allow partial speed advertisement.
        [TG3]: Add TG3_FLG2_IS_NIC flag.
        [TG3]: Add 5787F device ID.
        [TG3]: Fix Phy loopback.
        [WANROUTER]: Kill kmalloc debugging code.
        [TCP] inet_twdr_hangman: Delete unnecessary memory barrier().
        [NET]: Memory barrier cleanups
        [IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
        audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
        audit: Add auditing to ipsec
        [IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=n
        [IrDA]: Incorrect TTP header reservation
        [IrDA]: PXA FIR code device model conversion
        [GENETLINK]: Fix misplaced command flags.
        [NETLIK]: Add a pointer to the Generic Netlink wiki page.
        [IPV6] RAW: Don't release unlocked sock.
        ...
      2685b267
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · 4522d582
      Linus Torvalds authored
      * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (156 commits)
        [PATCH] x86-64: Export smp_call_function_single
        [PATCH] i386: Clean up smp_tune_scheduling()
        [PATCH] unwinder: move .eh_frame to RODATA
        [PATCH] unwinder: fully support linker generated .eh_frame_hdr section
        [PATCH] x86-64: don't use set_irq_regs()
        [PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
        [PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
        [PATCH] i386: replace kmalloc+memset with kzalloc
        [PATCH] x86-64: remove remaining pc98 code
        [PATCH] x86-64: remove unused variable
        [PATCH] x86-64: Fix constraints in atomic_add_return()
        [PATCH] x86-64: fix asm constraints in i386 atomic_add_return
        [PATCH] x86-64: Correct documentation for bzImage protocol v2.05
        [PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
        [PATCH] x86-64: Fix numaq build error
        [PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
        [PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
        [PATCH] x86-64: Clarify error message in GART code
        [PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
        [PATCH] x86-64: Remove unwind stack pointer alignment forcing again
        ...
      
      Fixed conflict in include/linux/uaccess.h manually
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4522d582
    • Andrew Morton's avatar
      [PATCH] elf.h: forward declare struct file · 6cf24f03
      Andrew Morton authored
        In file included from include/asm/patch.h:14,
      		 from arch/ia64/kernel/patch.c:10:
        include/linux/elf.h:375: warning: "struct file" declared inside parameter list
        include/linux/elf.h:375: warning: its scope is only this definition or declaration, which is probably not what you want
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6cf24f03
    • Paul Menage's avatar
      [PATCH] cpuset: allow a larger buffer for writes to cpuset files · d3ed11c3
      Paul Menage authored
      When using fake NUMA setup, the number of memory nodes can greatly exceed
      the number of CPUs.  So the current limit in cpuset_common_file_write() is
      insufficient.
      Signed-off-by: default avatarPaul Menage <menage@google.com>
      Acked-by: default avatarPaul Jackson <pj@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d3ed11c3
    • Avantika Mathur's avatar
      [PATCH] ext4: Eliminate inline functions · 09b88252
      Avantika Mathur authored
      Removes all inline keywords, since the compiler will make static functions
      inline when it is appropriate.
      Signed-off-by: default avatarAvantika Mathur <mathur@us.ibm.com>
      Cc: <linux-ext4@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      09b88252
    • Avantika Mathur's avatar
      [PATCH] ext4: kmalloc to kzalloc · 5d4958f9
      Avantika Mathur authored
      Performs kmalloc to kzalloc conversion
      Signed-off-by: default avatarAvantika Mathur <mathur@us.ibm.com>
      Cc: <linux-ext4@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      5d4958f9