1. 23 Jun, 2006 23 commits
    • Yasunori Goto's avatar
      [PATCH] wait_table and zonelist initializing for memory hotadd: add return... · 718127cc
      Yasunori Goto authored
      [PATCH] wait_table and zonelist initializing for memory hotadd: add return code for init_current_empty_zone
      
      When add_zone() is called against empty zone (not populated zone), we have to
      initialize the zone which didn't initialize at boot time.  But,
      init_currently_empty_zone() may fail due to allocation of wait table.  So,
      this patch is to catch its error code.
      
      Changes against wait_table is in the next patch.
      Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      718127cc
    • Yasunori Goto's avatar
      [PATCH] wait_table and zonelist initializing for memory hotadd: change to... · 86356ab1
      Yasunori Goto authored
      [PATCH] wait_table and zonelist initializing for memory hotadd: change to meminit for build_zonelist
      
      Change definitions of some functions and data from __init to __meminit.
      
      These functions and data can be used after bootup by this patch to be used for
      hot-add codes.
      Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      86356ab1
    • Yasunori Goto's avatar
      [PATCH] wait_table and zonelist initializing for memory hotadd: change name of wait_table_size() · 02b694de
      Yasunori Goto authored
      
      This is just to rename from wait_table_size() to wait_table_hash_nr_entries().
      Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      02b694de
    • Christoph Lameter's avatar
      [PATCH] migration: remove unnecessary PageSwapCache checks · 3c5a87f4
      Christoph Lameter authored
      
      Remove two unnecessary PageSwapCache checks.  The page refcount is raised
      and therefore page migration cannot occur in both functions.
      Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
      Cc: Hugh Dickins <hugh@veritas.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      3c5a87f4
    • Pekka Enberg's avatar
      [PATCH] slab: page mapping cleanup · 4776874f
      Pekka Enberg authored
      
      Clean up slab allocator page mapping a bit.  The memory allocated for a
      slab is physically contiguous so it is okay to assume struct pages are too
      so kill the long-standing comment.  Furthermore, rename set_slab_attr to
      slab_map_pages and add a comment explaining why its needed.
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4776874f
    • Andrew Morton's avatar
      [PATCH] PG_uncached is ia64 only · f886ed44
      Andrew Morton authored
      
      As Nick points out, only ia64 uses PG_uncached.  So we can push it up into the
      higher bits of the lower half of page->flags and make room for another flag on
      32-bit machines.
      
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Cc: Jesse Barnes <jbarnes@sgi.com>
      Cc: Jes Sorensen <jes@trained-monkey.org>
      Cc: Nick Piggin <nickpiggin@yahoo.com.au>
      Cc: Andy Whitcroft <apw@shadowen.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f886ed44
    • Pekka Enberg's avatar
      [PATCH] slab: extract cache_free_alien from __cache_free · 729bd0b7
      Pekka Enberg authored
      
      Move alien object freeing to cache_free_alien() to reduce #ifdef clutter in
      __cache_free().
      Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
      Acked-by: default avatarChristoph Lameter <clameter@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      729bd0b7
    • Christoph Lameter's avatar
      [PATCH] Page Migration: Make do_swap_page redo the fault · 4da5eda0
      Christoph Lameter authored
      
      It is better to redo the complete fault if do_swap_page() finds that the
      page is not in PageSwapCache() because the page migration code may have
      replaced the swap pte already with a pte pointing to valid memory.
      
      do_swap_page() may interpret an invalid swap entry without this patch
      because we do not reload the pte if we are looping back.  The page
      migration code may already have reused the swap entry referenced by our
      local swp_entry.
      Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
      Cc: Hugh Dickins <hugh@veritas.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      4da5eda0
    • Andy Whitcroft's avatar
      [PATCH] zone handle unaligned zone boundaries · cb2b95e1
      Andy Whitcroft authored
      
      The buddy allocator has a requirement that boundaries between contigious
      zones occur aligned with the the MAX_ORDER ranges.  Where they do not we
      will incorrectly merge pages cross zone boundaries.  This can lead to pages
      from the wrong zone being handed out.
      
      Originally the buddy allocator would check that buddies were in the same
      zone by referencing the zone start and end page frame numbers.  This was
      removed as it became very expensive and the buddy allocator already made
      the assumption that zones boundaries were aligned.
      
      It is clear that not all configurations and architectures are honouring
      this alignment requirement.  Therefore it seems safest to reintroduce
      support for non-aligned zone boundaries.  This patch introduces a new check
      when considering a page a buddy it compares the zone_table index for the
      two pages and refuses to merge the pages where they do not match.  The
      zone_table index is unique for each node/zone combination when
      FLATMEM/DISCONTIGMEM is enabled and for each section/zone combination when
      SPARSEMEM is enabled (a SPARSEMEM section is at least a MAX_ORDER size).
      Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
      Cc: Dave Hansen <haveblue@us.ibm.com>
      Cc: Mel Gorman <mel@csn.ul.ie>
      Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
      Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      cb2b95e1
    • KAMEZAWA Hiroyuki's avatar
      [PATCH] for_each_possible_cpu: xfs · 6f0419e0
      KAMEZAWA Hiroyuki authored
      
      for_each_cpu() actually iterates across all possible CPUs.  We've had mistakes
      in the past where people were using for_each_cpu() where they should have been
      iterating across only online or present CPUs.  This is inefficient and
      possibly buggy.
      
      We're renaming for_each_cpu() to for_each_possible_cpu() to avoid this in the
      future.
      
      This patch replaces for_each_cpu with for_each_possible_cpu.
      in xfs.
      Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Acked-by: default avatarNathan Scott <nathans@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      6f0419e0
    • David Howells's avatar
      [PATCH] XFS: Use the dentry passed to statfs() to limit the scope of the results · d6938d1b
      David Howells authored
      
      Enable XFS to limit the statfs() results to the project quota covering the
      dentry used as a base for call.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d6938d1b
    • David Howells's avatar
      [PATCH] VFS: Permit filesystem to perform statfs with a known root dentry · 726c3342
      David Howells authored
      
      Give the statfs superblock operation a dentry pointer rather than a superblock
      pointer.
      
      This complements the get_sb() patch.  That reduced the significance of
      sb->s_root, allowing NFS to place a fake root there.  However, NFS does
      require a dentry to use as a target for the statfs operation.  This permits
      the root in the vfsmount to be used instead.
      
      linux/mount.h has been added where necessary to make allyesconfig build
      successfully.
      
      Interest has also been expressed for use with the FUSE and XFS filesystems.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Cc: Nathan Scott <nathans@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      726c3342
    • David Howells's avatar
      [PATCH] VFS: Permit filesystem to override root dentry on mount · 454e2398
      David Howells authored
      
      Extend the get_sb() filesystem operation to take an extra argument that
      permits the VFS to pass in the target vfsmount that defines the mountpoint.
      
      The filesystem is then required to manually set the superblock and root dentry
      pointers.  For most filesystems, this should be done with simple_set_mnt()
      which will set the superblock pointer and then set the root dentry to the
      superblock's s_root (as per the old default behaviour).
      
      The get_sb() op now returns an integer as there's now no need to return the
      superblock pointer.
      
      This patch permits a superblock to be implicitly shared amongst several mount
      points, such as can be done with NFS to avoid potential inode aliasing.  In
      such a case, simple_set_mnt() would not be called, and instead the mnt_root
      and mnt_sb would be set directly.
      
      The patch also makes the following changes:
      
       (*) the get_sb_*() convenience functions in the core kernel now take a vfsmount
           pointer argument and return an integer, so most filesystems have to change
           very little.
      
       (*) If one of the convenience function is not used, then get_sb() should
           normally call simple_set_mnt() to instantiate the vfsmount. This will
           always return 0, and so can be tail-called from get_sb().
      
       (*) generic_shutdown_super() now calls shrink_dcache_sb() to clean up the
           dcache upon superblock destruction rather than shrink_dcache_anon().
      
           This is required because the superblock may now have multiple trees that
           aren't actually bound to s_root, but that still need to be cleaned up. The
           currently called functions assume that the whole tree is rooted at s_root,
           and that anonymous dentries are not the roots of trees which results in
           dentries being left unculled.
      
           However, with the way NFS superblock sharing are currently set to be
           implemented, these assumptions are violated: the root of the filesystem is
           simply a dummy dentry and inode (the real inode for '/' may well be
           inaccessible), and all the vfsmounts are rooted on anonymous[*] dentries
           with child trees.
      
           [*] Anonymous until discovered from another tree.
      
       (*) The documentation has been adjusted, including the additional bit of
           changing ext2_* into foo_* in the documentation.
      
      [akpm@osdl.org: convert ipath_fs, do other stuff]
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Cc: Nathan Scott <nathans@sgi.com>
      Cc: Roland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      454e2398
    • Rachita Kothiyal's avatar
      [PATCH] Fix cdrom being confused on using kdump · 1ad55440
      Rachita Kothiyal authored
      
      I have seen the cdrom drive appearing confused on using kdump on certain
      x86_64 systems.  During the booting up of the second kernel, the following
      message would keep flooding the console, and the booting would not proceed
      any further.
      
      hda: cdrom_pc_intr: The drive appears confused (ireason = 0x01)
      
      In this patch, whenever we are hitting a confused state in the interrupt
      handler with the DRQ set, we end the request and return ide_stopped.  Using
      this I dont see the status error.
      Signed-off-by: default avatarRachita Kothiyal <rachita@in.ibm.com>
      Acked-by: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      1ad55440
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 5fa21d82
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        [PATCH] Driver core: fix locking issues with the devices that are attached to classes
        [PATCH] USB: get USB suspend to work again
      5fa21d82
    • Greg Kroah-Hartman's avatar
      5d9fd169
    • Greg Kroah-Hartman's avatar
      [PATCH] USB: get USB suspend to work again · 0517587e
      Greg Kroah-Hartman authored
      
      Yeah, it's a hack, but it is only temporary until Alan's patches
      reworking this area make it in.  We really should not care what devices
      below us are doing, especially when we do not really know what type of
      devices they are.  This patch relies on the fact that the endpoint
      devices do not have a driver assigned to us.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      0517587e
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc · 8542e589
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-mmc:
        [ARM] 3565/1: AT91RM9200 MMC update
        [MMC] Convert all hosts except mmci to use data->blksz
      8542e589
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 6f3cafce
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (21 commits)
        [ARM] 3629/1: S3C24XX: fix missing bracket in regs-dsc.h
        [ARM] 3537/1: Rework DMA-bounce locking for finer granularity
        [ARM] 3601/1: i.MX/MX1 DMA error handling for signaled channels only
        [ARM] 3597/1: ixp4xx/nslu2: Board support for new LED subsystem
        [ARM] 3595/1: ixp4xx/nas100d: Board support for new LED subsystem
        [ARM] 3626/1: ARM EABI: fix syscall restarting
        [ARM] 3628/1: S3C24XX: add get_rate call to struct clk
        [ARM] 3627/1: S3C24XX: split s3c2410 clocks from core clocks
        [ARM] 3613/1: S3C2410: Add sysdev and sysclass
        [ARM] 3624/1: Report true modem control line states
        [ARM] 3620/2: ixp23xx: add uengine loader support
        [ARM] 3618/1: add defconfig for logicpd pxa270 card engine
        [ARM] 3617/1: ep93xx: fix slightly incorrect timer tick rate
        [ARM] 3616/1: fix timer handler wrap logic for a number of platforms
        [ARM] 3615/1: ixp23xx: use platform devices for physmap flash
        [ARM] 3614/1: ep93xx: use platform devices for physmap flash
        [ARM] 3621/1: fix compilation breakage for pnx4008
        [ARM] 3623/1: pnx4008: move GPIO-related defines to gpio.h
        [ARM] 3622/1: pnx4008: remove clk_use/clk_unuse
        [ARM] Enable VFP to be built when non-VFP capable CPUs are selected
        ...
      6f3cafce
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial · 0c97f524
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial:
        [ARM] 3600/1: increase amba-pl010 UART_NR to 8
        [ARM] 3571/1: netX: serial driver for Hilscher netX
      0c97f524
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq · c71bd694
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix ondemand vs suspend deadlock
        [CPUFREQ] Fix powernow-k8 SMP kernel on UP hardware bug.
        [PATCH] redirect speedstep-centrino maintainer mail to cpufreq list
        [CPUFREQ] correct powernow-k8 fid/vid masks for extended parts
        [CPUFREQ] Clarify powernow-k8 cpu_family statements
      c71bd694
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 065a3e17
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (33 commits)
        [PATCH] myri10ge - drop workaround pci_save_state() disabling MSI
        [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
        via-velocity: the link is not correctly detected when the device starts
        [PATCH] add b44 to maintainers
        [PATCH] WAN: ioremap() failure checks in drivers
        [PATCH] WAN: register_hdlc_device() doesn't need dev_alloc_name()
        [PATCH] skb_padto()-area fixes in 8390, wavelan
        [PATCH] make drivers/net/forcedeth.c:nv_update_pause() static
        [PATCH] network driver for Hilscher netx
        [PATCH] Dereference in tokenring/olympic.c
        [PATCH] Array overrun in drivers/net/wireless/wavelan.c
        [PATCH] Remove useless check in drivers/net/pcmcia/xirc2ps_cs.c
        [PATCH] 8139cp: add ethtool eeprom support
        [PATCH] 8139cp: fix eeprom read command length
        [PATCH] b44: update b44 Kconfig entry
        [PATCH] b44: update version to 1.01
        [PATCH] b44: add wol for old nic
        [PATCH] b44: add parameter
        [PATCH] b44: add wol
        [PATCH] b44: fix manual speed/duplex/autoneg settings
        ...
      065a3e17
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 45c091bb
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
        [POWERPC] re-enable OProfile for iSeries, using timer interrupt
        [POWERPC] support ibm,extended-*-frequency properties
        [POWERPC] Extra sanity check in EEH code
        [POWERPC] Dont look for class-code in pci children
        [POWERPC] Fix mdelay badness on shared processor partitions
        [POWERPC] disable floating point exceptions for init
        [POWERPC] Unify ppc syscall tables
        [POWERPC] mpic: add support for serial mode interrupts
        [POWERPC] pseries: Print PCI slot location code on failure
        [POWERPC] spufs: one more fix for 64k pages
        [POWERPC] spufs: fail spu_create with invalid flags
        [POWERPC] spufs: clear class2 interrupt status before wakeup
        [POWERPC] spufs: fix Makefile for "make clean"
        [POWERPC] spufs: remove stop_code from struct spu
        [POWERPC] spufs: fix spu irq affinity setting
        [POWERPC] spufs: further abstract priv1 register access
        [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
        [POWERPC] spufs: dont try to access SPE channel 1 count
        [POWERPC] spufs: use kzalloc in create_spu
        [POWERPC] spufs: fix initial state of wbox file
        ...
      
      Manually resolved conflicts in:
      	drivers/net/phy/Makefile
      	include/asm-powerpc/spu.h
      45c091bb
  2. 22 Jun, 2006 17 commits