1. 26 Sep, 2006 31 commits
  2. 25 Sep, 2006 9 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 7e472020
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [NetLabel]: update docs with website information
        [NetLabel]: rework the Netlink attribute handling (part 2)
        [NetLabel]: rework the Netlink attribute handling (part 1)
        [Netlink]: add nla_validate_nested()
        [NETLINK]: add nla_for_each_nested() to the interface list
        [NetLabel]: change the SELinux permissions
        [NetLabel]: make the CIPSOv4 cache spinlocks bottom half safe
        [NetLabel]: correct improper handling of non-NetLabel peer contexts
        [TCP]: make cubic the default
        [TCP]: default congestion control menu
        [ATM] he: Fix __init/__devinit conflict
        [NETFILTER]: Add dscp,DSCP headers to header-y
        [DCCP]: Introduce dccp_probe
        [DCCP]: Use constants for CCIDs
        [DCCP]: Introduce constants for CCID numbers
        [DCCP]: Allow default/fallback service code.
      7e472020
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 7b29122f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SOUND] sparc/amd7930: Use __devinit and __devinitdata as needed.
        [SUNLANCE]: Mark sparc_lance_probe_one as __devinit.
        [SPARC64]: Fix section-mismatch errors in solaris emul module.
      7b29122f
    • Jonathan Corbet's avatar
      [PATCH] VIDIOC_ENUMSTD bug · b7de567b
      Jonathan Corbet authored
      
      
      The v4l2 API documentation for VIDIOC_ENUMSTD says:
      
      	To enumerate all standards applications shall begin at index
      	zero, incrementing by one until the driver returns EINVAL.
      
      The actual code, however, tests the index this way:
      
                     if (index<=0 || index >= vfd->tvnormsize) {
                              ret=-EINVAL;
      
      So any application which passes in index=0 gets EINVAL right off the bat
      - and, in fact, this is what happens to mplayer.  So I think the
      following patch is called for, and maybe even appropriate for a 2.6.18.x
      stable release.
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      b7de567b
    • Ed Swierk's avatar
      [PATCH] load_module: no BUG if module_subsys uninitialized · 1cc5f714
      Ed Swierk authored
      
      
      Invoking load_module() before param_sysfs_init() is called crashes in
      mod_sysfs_setup(), since the kset in module_subsys is not initialized yet.
      
      In my case, net-pf-1 is getting modprobed as a result of hotplug trying to
      create a UNIX socket.  Calls to hotplug begin after the topology_init
      initcall.
      
      Another patch for the same symptom (module_subsys-initialize-earlier.patch)
      moves param_sysfs_init() to the subsys initcalls, but this is still not
      early enough in the boot process in some cases.  In particular,
      topology_init() causes /sbin/hotplug to run, which requests net-pf-1 (the
      UNIX socket protocol) which can be compiled as a module.  Moving
      param_sysfs_init() to the postcore initcalls fixes this particular race,
      but there might well be other cases where a usermodehelper causes a module
      to load earlier still.
      
      The patch makes load_module() return an error rather than crashing the
      kernel if invoked before module_subsys is initialized.
      
      Cc: Mark Huang <mlhuang@cs.princeton.edu>
      Cc: Greg KH <greg@kroah.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      1cc5f714
    • keith mannthey's avatar
      [PATCH] i386: fix flat mode numa on a real numa system · bfa0e9a0
      keith mannthey authored
      
      
      If there is only 1 node in the system cpus should think they are apart of
      some other node.
      
      If cases where a real numa system boots the Flat numa option make sure the
      cpus don't claim to be apart on a non-existent node.
      Signed-off-by: default avatarKeith Mannthey <kmannth@us.ibm.com>
      Cc: Andy Whitcroft <apw@shadowen.org>
      Cc: Dave Hansen <haveblue@us.ibm.com>
      Cc: Andi Kleen <ak@suse.de>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      bfa0e9a0
    • KAMEZAWA Hiroyuki's avatar
      [PATCH] cpu to node relationship fixup: map cpu to node · 3212fe15
      KAMEZAWA Hiroyuki authored
      
      
      Assume that a cpu is *physically* offlined at boot time...
      
      Because smpboot.c::smp_boot_cpu_map() canoot find cpu's sapicid,
      numa.c::build_cpu_to_node_map() cannot build cpu<->node map for
      offlined cpu.
      
      For such cpus, cpu_to_node map should be fixed at cpu-hot-add.
      This mapping should be done before cpu onlining.
      
      This patch also handles cpu hotremove case.
      Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      3212fe15
    • KAMEZAWA Hiroyuki's avatar
      [PATCH] cpu to node relationship fixup: acpi_map_cpu2node · 08992986
      KAMEZAWA Hiroyuki authored
      
      
      Problem description:
      
        We have additional_cpus= option for allocating possible_cpus.  But nid
        for possible cpus are not fixed at boot time.  cpus which is offlined at
        boot or cpus which is not on SRAT is not tied to its node.  This will
        cause panic at cpu onlining.
      
      Usually, pxm_to_nid() mapping is fixed at boot time by SRAT.
      
      But, unfortunately, some system (my system!) do not include
      full SRAT table for possible cpus.  (Then, I use
      additiona_cpus= option.)
      
      For such possible cpus, pxm<->nid should be fixed at
      hot-add.  We now have acpi_map_pxm_to_node() which is also
      used at boot.  It's suitable here.
      Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
      Cc: "Luck, Tony" <tony.luck@intel.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      08992986
    • Michael Hanselmann's avatar
      [PATCH] backlight: fix oops in __mutex_lock_slowpath during head /sys/class/graphics/fb0/* · 25981de5
      Michael Hanselmann authored
      
      
      Seems like not all drivers use the framebuffer_alloc() function and won't
      have an initialized mutex.  But those don't have a backlight, anyway.
      Signed-off-by: default avatarMichael Hanselmann <linux-kernel@hansmi.ch>
      Cc: Olaf Hering <olaf@aepfle.de>
      Cc: "Antonino A. Daplas" <adaplas@pol.net>
      Cc: Daniel R Thompson <daniel.thompson@st.com>
      Cc: Jon Smirl <jonsmirl@gmail.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      25981de5
    • David Rientjes's avatar
      [PATCH] do not free non slab allocated per_cpu_pageset · f3ef9ead
      David Rientjes authored
      
      
      Stops panic associated with attempting to free a non slab-allocated
      per_cpu_pageset.
      Signed-off-by: default avatarDavid Rientjes <rientjes@cs.washington.edu>
      Acked-by: default avatarChristoph Lameter <clameter@sgi.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      f3ef9ead