Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Commits on Jul 16, 2012
  1. @colincross

    Merge commit 'v3.4.5' into android-3.4

    colincross authored
    Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0
Commits on Jun 17, 2012
  1. @rustyrussell @gregkh

    module_param: stop double-calling parameters.

    rustyrussell authored gregkh committed
    commit ae82fdb upstream.
    Commit 026cee0 "params:
    <level>_initcall-like kernel parameters" set old-style module
    parameters to level 0.  And we call those level 0 calls where we used
    to, early in start_kernel().
    We also loop through the initcall levels and call the levelled
    module_params before the corresponding initcall.  Unfortunately level
    0 is early_init(), so we call the standard module_param calls twice.
    (Turns out most things don't care, but at least ubi.mtd does).
    Change the level to -1 for standard module_param calls.
    Reported-by: Benoît Thébaudeau <>
    Signed-off-by: Rusty Russell <>
    Signed-off-by: Greg Kroah-Hartman <>
Commits on Jun 1, 2012
  1. @torvalds @gregkh

    Fix blocking allocations called very early during bootup

    torvalds authored gregkh committed
    commit 31a6710 upstream.
    During early boot, when the scheduler hasn't really been fully set up,
    we really can't do blocking allocations because with certain (dubious)
    configurations the "might_resched()" calls can actually result in
    scheduling events.
    We could just make such users always use GFP_ATOMIC, but quite often the
    code that does the allocation isn't really aware of the fact that the
    scheduler isn't up yet, and forcing that kind of random knowledge on the
    initialization code is just annoying and not good for anybody.
    And we actually have a the 'gfp_allowed_mask' exactly for this reason:
    it's just that the kernel init sequence happens to set it to allow
    blocking allocations much too early.
    So move the 'gfp_allowed_mask' initialization from 'start_kernel()'
    (which is some of the earliest init code, and runs with preemption
    disabled for good reasons) into 'kernel_init()'.  kernel_init() is run
    in the newly created thread that will become the 'init' process, as
    opposed to the early startup code that runs within the context of what
    will be the first idle thread.
    So by the time we reach 'kernel_init()', we know that the scheduler must
    be at least limping along, because we've already scheduled from the idle
    thread into the init thread.
    Reported-by: Steven Rostedt <>
    Cc: David Rientjes <>
    Signed-off-by: Linus Torvalds <>
    Signed-off-by: Greg Kroah-Hartman <>
Commits on May 8, 2012
  1. @colincross

    Merge commit 'v3.4-rc6' into android-3.4

    colincross authored
    Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91
Commits on May 5, 2012
  1. @sashalevin @torvalds

    init: don't try mounting device as nfs root unless type fully matches

    sashalevin authored torvalds committed
    Currently, we'll try mounting any device who's major device number is
    UNNAMED_MAJOR as NFS root.  This would happen for non-NFS devices as
    well (such as 9p devices) but it wouldn't cause any issues since
    mounting the device as NFS would fail quickly and the code proceeded to
    doing the proper mount:
           [  101.522716] VFS: Unable to mount root fs via NFS, trying floppy.
           [  101.534499] VFS: Mounted root (9p filesystem) on device 0:18.
    Commit 6829a048102a ("NFS: Retry mounting NFSROOT") introduced retries
    when mounting NFS root, which means that now we don't immediately fail
    and instead it takes an additional 90+ seconds until we stop retrying,
    which has revealed the issue this patch fixes.
    This meant that it would take an additional 90 seconds to boot when
    we're not using a device type which gets detected in order before NFS.
    This patch modifies the NFS type check to require device type to be
    'Root_NFS' instead of requiring the device to have an UNNAMED_MAJOR
    major.  This makes boot process cleaner since we now won't go through
    the NFS mounting code at all when the device isn't an NFS root
    Signed-off-by: Sasha Levin <>
    Signed-off-by: Linus Torvalds <>
Commits on May 1, 2012
  1. @colincross
Commits on Apr 25, 2012
  1. @cmetcalf-tilera

    init: fix bug where environment vars can't be passed via boot args

    cmetcalf-tilera authored
    Commit 026cee0 had the side-effect of dropping the '=' from
    the unknown boot arguments that are passed to init as environment
    variables.  This is because parse_args() puts a NUL in the string
    where the '=' was when it passes the "param" and "val" pointers
    to the parsing subfunctions.  Previously, unknown_bootoption() was
    the last parse_args() subfunction to run, and it carefully put back
    the '=' character.  Now the ignore_unknown_bootoption() is the last
    one to run, and it wasn't doing the necessary repair, so the
    envp params ended up with the embedded NUL and were no longer
    seen as valid environment variables by init.
    Tested-by: Woody Suwalski <>
    Acked-by: Pawel Moll <>
    Signed-off-by: Chris Metcalf <>
Commits on Apr 9, 2012
  1. @colincross

    Add build option to to set the default panic timeout.

    Arve Hjønnevåg authored colincross committed
Commits on Apr 2, 2012
  1. @torvalds

    Merge tag 'for-linus' of git://

    torvalds authored
    Pull cpumask cleanups from Rusty Russell:
     "(Somehow forgot to send this out; it's been sitting in linux-next, and
      if you don't want it, it can sit there another cycle)"
    I'm a sucker for things that actually delete lines of code.
    Fix up trivial conflict in arch/arm/kernel/kprobes.c, where Rusty fixed
    a user of &cpu_online_map to be cpu_online_mask, but that code got
    deleted by commit b21d55e ("ARM: 7332/1: extract out code patch
    function from kprobes").
    * tag 'for-linus' of git://
      cpumask: remove old cpu_*_map.
      documentation: remove references to cpu_*_map.
      drivers/cpufreq/db8500-cpufreq: remove references to cpu_*_map.
      remove references to cpu_*_map in arch/
Commits on Mar 31, 2012
  1. new helper: ext2_image_size()

    Al Viro authored
    ... implemented that way since the next commit will leave it
    almost alone in ext2_fs.h - most of the file (including
    struct ext2_super_block) is going to move to fs/ext2/ext2.h.
    Signed-off-by: Al Viro <>
  2. get rid of pointless includes of ext2_fs.h

    Al Viro authored
    Signed-off-by: Al Viro <>
Commits on Mar 29, 2012
  1. @rustyrussell

    documentation: remove references to cpu_*_map.

    rustyrussell authored
    This has been obsolescent for a while, fix documentation and
    misc comments.
    Signed-off-by: Rusty Russell <>
Commits on Mar 28, 2012
  1. @torvalds

    Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel…

    torvalds authored
    Pull "Disintegrate and delete asm/system.h" from David Howells:
     "Here are a bunch of patches to disintegrate asm/system.h into a set of
      separate bits to relieve the problem of circular inclusion
      I've built all the working defconfigs from all the arches that I can
      and made sure that they don't break.
      The reason for these patches is that I recently encountered a circular
      dependency problem that came about when I produced some patches to
      optimise get_order() by rewriting it to use ilog2().
      This uses bitops - and on the SH arch asm/bitops.h drags in
      asm-generic/get_order.h by a circuituous route involving asm/system.h.
      The main difficulty seems to be asm/system.h.  It holds a number of
      low level bits with no/few dependencies that are commonly used (eg.
      memory barriers) and a number of bits with more dependencies that
      aren't used in many places (eg.  switch_to()).
      These patches break asm/system.h up into the following core pieces:
        (1) asm/barrier.h
            Move memory barriers here.  This already done for MIPS and Alpha.
        (2) asm/switch_to.h
            Move switch_to() and related stuff here.
        (3) asm/exec.h
            Move arch_align_stack() here.  Other process execution related bits
            could perhaps go here from asm/processor.h.
        (4) asm/cmpxchg.h
            Move xchg() and cmpxchg() here as they're full word atomic ops and
            frequently used by atomic_xchg() and atomic_cmpxchg().
        (5) asm/bug.h
            Move die() and related bits.
        (6) asm/auxvec.h
            Move AT_VECTOR_SIZE_ARCH here.
      Other arch headers are created as needed on a per-arch basis."
    Fixed up some conflicts from other header file cleanups and moving code
    around that has happened in the meantime, so David's testing is somewhat
    weakened by that.  We'll find out anything that got broken and fix it..
    * tag 'split-asm_system_h-for-linus-20120328' of git:// (38 commits)
      Delete all instances of asm/system.h
      Remove all #inclusions of asm/system.h
      Add #includes needed to permit the removal of asm/system.h
      Move all declarations of free_initmem() to linux/mm.h
      Disintegrate asm/system.h for OpenRISC
      Split arch_align_stack() out from asm-generic/system.h
      Split the switch_to() wrapper out of asm-generic/system.h
      Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h
      Create asm-generic/barrier.h
      Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
      Disintegrate asm/system.h for Xtensa
      Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
      Disintegrate asm/system.h for Tile
      Disintegrate asm/system.h for Sparc
      Disintegrate asm/system.h for SH
      Disintegrate asm/system.h for Score
      Disintegrate asm/system.h for S390
      Disintegrate asm/system.h for PowerPC
      Disintegrate asm/system.h for PA-RISC
      Disintegrate asm/system.h for MN10300
  2. Move all declarations of free_initmem() to linux/mm.h

    David Howells authored
    Move all declarations of free_initmem() to linux/mm.h so that there's only one
    and it's used by everything.
    Signed-off-by: David Howells <>
Commits on Mar 26, 2012
  1. @rustyrussell

    params: <level>_initcall-like kernel parameters

    Pawel Moll authored rustyrussell committed
    This patch adds a set of macros that can be used to declare
    kernel parameters to be parsed _before_ initcalls at a chosen
    level are executed.  We rename the now-unused "flags" field of
    struct kernel_param as the level.  It's signed, for when we
    use this for early params as well, in future.
    Linker macro collating init calls had to be modified in order
    to add additional symbols between levels that are later used
    by the init code to split the calls into blocks.
    Signed-off-by: Pawel Moll <>
    Signed-off-by: Rusty Russell <>
Commits on Mar 23, 2012
  1. @bwalle @torvalds

    init/do_mounts.c: print error code on mount failure

    bwalle authored torvalds committed
    Printing the error code makes it easier to debug the cause of a mount
    failure.  For example I had the problem that the root file system could
    not be mounted read-writeable because my SD card was write-protected.
    Without an error code it looks like the SD card was not detected at all.
    Signed-off-by: Bernhard Walle <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  2. @torvalds

    init: check printed flag to skip printing message

    Diwakar Tundlam authored torvalds committed
    Otherwise the 'Calibration skipped' message gets printed everytime a CPU
    is hotplugged in, cluttering console for systems that frequently hotplug
    Signed-off-by: Diwakar Tundlam <>
    Cc: Phil Carmody <>
    Cc: Russell King <>
    Cc: Greg KH <>
    Cc: Sameer Nanda <>
    Cc: Peter De Schrijver <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
Commits on Mar 22, 2012
  1. @torvalds

    Merge branch 'next' of git://…

    torvalds authored
    Pull powerpc merge from Benjamin Herrenschmidt:
     "Here's the powerpc batch for this merge window.  It is going to be a
      bit more nasty than usual as in touching things outside of
      arch/powerpc mostly due to the big iSeriesectomy :-) We finally got
      rid of the bugger (legacy iSeries support) which was a PITA to
      maintain and that nobody really used anymore.
      Here are some of the highlights:
       - Legacy iSeries is gone.  Thanks Stephen ! There's still some bits
         and pieces remaining if you do a grep -ir series arch/powerpc but
         they are harmless and will be removed in the next few weeks
       - The 'fadump' functionality (Firmware Assisted Dump) replaces the
         previous (equivalent) "pHyp assisted dump"...  it's a rewrite of a
         mechanism to get the hypervisor to do crash dumps on pSeries, the
         new implementation hopefully being much more reliable.  Thanks
         Mahesh Salgaonkar.
       - The "EEH" code (pSeries PCI error handling & recovery) got a big
         spring cleaning, motivated by the need to be able to implement a
         new backend for it on top of some new different type of firwmare.
         The work isn't complete yet, but a good chunk of the cleanups is
         there.  Note that this adds a field to struct device_node which is
         not very nice and which Grant objects to.  I will have a patch soon
         that moves that to a powerpc private data structure (hopefully
         before rc1) and we'll improve things further later on (hopefully
         getting rid of the need for that pointer completely).  Thanks Gavin
       - I dug into our exception & interrupt handling code to improve the
         way we do lazy interrupt handling (and make it work properly with
         "edge" triggered interrupt sources), and while at it found & fixed
         a wagon of issues in those areas, including adding support for page
         fault retry & fatal signals on page faults.
       - Your usual random batch of small fixes & updates, including a bunch
         of new embedded boards, both Freescale and APM based ones, etc..."
    I fixed up some conflicts with the generalized irq-domain changes from
    Grant Likely, hopefully correctly.
    * 'next' of git:// (141 commits)
      powerpc/ps3: Do not adjust the wrapper load address
      powerpc: Remove the rest of the legacy iSeries include files
      powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces
      init: Remove CONFIG_PPC_ISERIES
      powerpc: Remove FW_FEATURE ISERIES from arch code
      tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable
      powerpc/spufs: Fix double unlocks
      powerpc/5200: convert mpc5200 to use of_platform_populate()
      powerpc/mpc5200: add options to mpc5200_defconfig
      powerpc/mpc52xx: add a4m072 board support
      powerpc/mpc5200: update mpc5200_defconfig to fit for charon board
      Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup
      powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board
      powerpc/44x: Add support PCI-E for APM821xx SoC and Bluestone board
      MAINTAINERS: Update PowerPC 4xx tree
      powerpc/44x: The bug fixed support for APM821xx SoC and Bluestone board
      powerpc: document the FSL MPIC message register binding
      powerpc: add support for MPIC message register API
      powerpc/fsl: Added aliased MSIIR register address to MSI node in dts
      powerpc/85xx: mpc8548cds - add 36-bit dts
Commits on Mar 21, 2012
  1. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds authored
    Pull trivial tree from Jiri Kosina:
     "It's indeed trivial -- mostly documentation updates and a bunch of
      typo fixes from Masanari.
      There are also several linux/version.h include removals from Jesper."
    * 'for-linus' of git:// (101 commits)
      kcore: fix spelling in read_kcore() comment
      constify struct pci_dev * in obvious cases
      Revert "char: Fix typo in viotape.c"
      init: fix wording error in mm_init comment
      usb: gadget: Kconfig: fix typo for 'different'
      Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
      writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
      writeback: fix typo in the writeback_control comment
      Documentation: Fix multiple typo in Documentation
      tpm_tis: fix tis_lock with respect to RCU
      Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
      Doc: Update numastat.txt
      qla4xxx: Add missing spaces to error messages
      compiler.h: Fix typo
      security: struct security_operations kerneldoc fix
      Documentation: broken URL in libata.tmpl
      Documentation: broken URL in filesystems.tmpl
      mtd: simplify return logic in do_map_probe()
      mm: fix comment typo of truncate_inode_pages_range
      power: bq27x00: Fix typos in comment
  2. @ozbenh

    init: Remove CONFIG_PPC_ISERIES

    Stephen Rothwell authored ozbenh committed
    It is no longer selectable, so remove the check for it.
    Signed-off-by: Stephen Rothwell <>
    Signed-off-by: Benjamin Herrenschmidt <>
Commits on Mar 20, 2012
  1. @torvalds

    Merge branch 'sched-core-for-linus' of git://…

    torvalds authored
    Pull scheduler changes for v3.4 from Ingo Molnar
    * 'sched-core-for-linus' of git:// (27 commits)
      printk: Make it compile with !CONFIG_PRINTK
      sched/x86: Fix overflow in cyc2ns_offset
      sched: Fix nohz load accounting -- again!
      sched: Update yield() docs
      printk/sched: Introduce special printk_sched() for those awkward moments
      sched/nohz: Correctly initialize 'next_balance' in 'nohz' idle balancer
      sched: Cleanup cpu_active madness
      sched: Fix load-balance wreckage
      sched: Clean up parameter passing of proc_sched_autogroup_set_nice()
      sched: Ditch per cgroup task lists for load-balancing
      sched: Rename load-balancing fields
      sched: Move load-balancing arguments into helper struct
      sched/rt: Do not submit new work when PI-blocked
      sched/rt: Prevent idle task boosting
      sched/wait: Add __wake_up_all_locked() API
      sched/rt: Document scheduler related skip-resched-check sites
      sched/rt: Use schedule_preempt_disabled()
      sched/rt: Add schedule_preempt_disabled()
      sched/rt: Do not throttle when PI boosting
      sched/rt: Keep period timer ticking when rt throttling is active
Commits on Mar 15, 2012
  1. @jimc

    init: fix wording error in mm_init comment

    jimc authored Jiri Kosina committed
    s/countinuous/contiguous/, reword sentence.
    Signed-off-by: Jim Cromie <>
    Acked-by: KAMEZAWA Hiroyuki <>
    Signed-off-by: Jiri Kosina <>
Commits on Mar 1, 2012
  1. sched/rt: Use schedule_preempt_disabled()

    Thomas Gleixner authored Ingo Molnar committed
    Coccinelle based conversion.
    Signed-off-by: Thomas Gleixner <>
    Acked-by: Peter Zijlstra <>
    Signed-off-by: Ingo Molnar <>
Commits on Feb 21, 2012
  1. @paulmck

    rcu: Move RCU_TRACE to lib/Kconfig.debug

    Paul E. McKenney authored paulmck committed
    The RCU_TRACE kernel parameter has always been intended for debugging,
    not for production use.  Formalize this by moving RCU_TRACE from
    init/Kconfig to lib/Kconfig.debug.
    Signed-off-by: Paul E. McKenney <>
    Signed-off-by: Paul E. McKenney <>
Commits on Jan 18, 2012
  1. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds authored
    * 'for-linus' of git:// (29 commits)
      audit: no leading space in audit_log_d_path prefix
      audit: treat s_id as an untrusted string
      audit: fix signedness bug in audit_log_execve_info()
      audit: comparison on interprocess fields
      audit: implement all object interfield comparisons
      audit: allow interfield comparison between gid and ogid
      audit: complex interfield comparison helper
      audit: allow interfield comparison in audit rules
      Kernel: Audit Support For The ARM Platform
      audit: do not call audit_getname on error
      audit: only allow tasks to set their loginuid if it is -1
      audit: remove task argument to audit_set_loginuid
      audit: allow audit matching on inode gid
      audit: allow matching on obj_uid
      audit: remove audit_finish_fork as it can't be called
      audit: reject entry,always rules
      audit: inline audit_free to simplify the look of generic code
      audit: drop audit_set_macxattr as it doesn't do anything
      audit: inline checks for not needing to collect aux records
      audit: drop some potentially inadvisable likely notations
    Use evil merge to fix up grammar mistakes in Kconfig file.
    Bad speling and horrible grammar (and copious swearing) is to be
    expected, but let's keep it to commit messages and comments, rather than
    expose it to users in config help texts or printouts.
Commits on Jan 17, 2012
  1. @nwhusted

    Kernel: Audit Support For The ARM Platform

    nwhusted authored Al Viro committed
    This patch provides functionality to audit system call events on the
    ARM platform. The implementation was based off the structure of the
    MIPS platform and information in this
    mailing list thread. The required audit_syscall_exit and
    audit_syscall_entry checks were added to ptrace using the standard
    registers for system call values (r0 through r3). A thread information
    flag was added for auditing (TIF_SYSCALL_AUDIT) and a meta-flag was
    added (_TIF_SYSCALL_WORK) to simplify modifications to the syscall
    entry/exit. Now, if either the TRACE flag is set or the AUDIT flag is
    set, the syscall_trace function will be executed. The prober changes
    were made to Kconfig to allow CONFIG_AUDITSYSCALL to be enabled.
    Due to platform availability limitations, this patch was only tested
    on the Android platform running the modified "android-goldfish-2.6.29"
    kernel. A test compile was performed using Code Sourcery's
    cross-compilation toolset and the current linux-3.0 stable kernel. The
    changes compile without error. I'm hoping, due to the simple modifications,
    the patch is "obviously correct".
    Signed-off-by: Nathaniel Husted <>
    Signed-off-by: Eric Paris <>
  2. @eparis

    audit: only allow tasks to set their loginuid if it is -1

    eparis authored Al Viro committed
    At the moment we allow tasks to set their loginuid if they have
    CAP_AUDIT_CONTROL.  In reality we want tasks to set the loginuid when they
    log in and it be impossible to ever reset.  We had to make it mutable even
    after it was once set (with the CAP) because on update and admin might have
    to restart sshd.  Now sshd would get his loginuid and the next user which
    logged in using ssh would not be able to set his loginuid.
    Systemd has changed how userspace works and allowed us to make the kernel
    work the way it should.  With systemd users (even admins) are not supposed
    to restart services directly.  The system will restart the service for
    them.  Thus since systemd is going to loginuid==-1, sshd would get -1, and
    sshd would be allowed to set a new loginuid without special permissions.
    If an admin in this system were to manually start an sshd he is inserting
    himself into the system chain of trust and thus, logically, it's his
    loginuid that should be used!  Since we have old systems I make this a
    Kconfig option.
    Signed-off-by: Eric Paris <>
Commits on Jan 14, 2012
  1. @torvalds

    Merge tag 'for-linus' of git://

    torvalds authored
    Autogenerated GPG tag for Rusty D1ADB8F1: 15EE 8D6C AB0E 7F0C F999  BFCB D920 0E6C D1AD B8F1
    * tag 'for-linus' of git://
      module_param: check that bool parameters really are bool.
      intelfbdrv.c: bailearly is an int module_param
      paride/pcd: fix bool verbose module parameter.
      module_param: make bool parameters really bool (drivers & misc)
      module_param: make bool parameters really bool (arch)
      module_param: make bool parameters really bool (core code)
      kernel/async: remove redundant declaration.
      printk: fix unnecessary module_param_name.
      lirc_parallel: fix module parameter description.
      module_param: avoid bool abuse, add bint for special cases.
      module_param: check type correctness for module_param_array
      modpost: use linker section to generate table.
      modpost: use a table rather than a giant if/else statement.
      modules: sysfs - export: taint, coresize, initsize
      kernel/params: replace DEBUGP with pr_debug
      module: replace DEBUGP with pr_debug
      module: struct module_ref should contains long fields
      module: Fix performance regression on modules with large symbol tables
      module: Add comments describing how the "strmap" logic works
    Fix up conflicts in scripts/mod/file2alias.c due to the new linker-
    generated table approach to adding __mod_*_device_table entries.  The
    ARM sa11x0 mcp bus needed to be converted to that too.
Commits on Jan 13, 2012
  1. @cyrillos @torvalds

    c/r: introduce CHECKPOINT_RESTORE symbol

    cyrillos authored torvalds committed
    For checkpoint/restore we need auxilary features being compiled into the
    kernel, such as additional prctl codes, /proc/<pid>/map_files and etc...
    but same time these features are not mandatory for a regular kernel so
    CHECKPOINT_RESTORE config symbol should bring a way to disable them all at
    once if one wish to get rid of additional functionality.
    Signed-off-by: Cyrill Gorcunov <>
    Cc: Tejun Heo <>
    Cc: Andrew Vagin <>
    Cc: Serge Hallyn <>
    Cc: Vasiliy Kulikov <>
    Reviewed-by: Kees Cook <>
    Cc: KAMEZAWA Hiroyuki <>
    Cc: Alexey Dobriyan <>
    Cc: "Eric W. Biederman" <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
Commits on Jan 12, 2012
  1. @rustyrussell

    module_param: make bool parameters really bool (core code)

    rustyrussell authored
    module_param(bool) used to counter-intuitively take an int.  In
    fddd520 (mid-2009) we allowed bool or int/unsigned int using a messy
    It's time to remove the int/unsigned int option.  For this version
    it'll simply give a warning, but it'll break next kernel version.
    Signed-off-by: Rusty Russell <>
  2. @torvalds

    Merge branch 'sched-urgent-for-linus' of git://…

    torvalds authored
    * 'sched-urgent-for-linus' of git://
      sched: Fix lockup by limiting load-balance retries on lock-break
      sched: Fix CONFIG_CGROUP_SCHED dependency
      sched: Remove empty #ifdefs
  3. @torvalds

    Merge branch 'x86-platform-for-linus' of git://…

    torvalds authored
    * 'x86-platform-for-linus' of git://
      x86/intel config: Fix the APB_TIMER selection
      x86/mrst: Add additional debug prints for pb_keys
      x86/intel config: Revamp configuration to allow for Moorestown and Medfield
      x86/intel/scu/ipc: Match the changes in the x86 configuration
      x86/apb: Fix configuration constraints
      x86: Fix INTEL_MID silly
      x86/Kconfig: Cyclone-timer depends on x86-summit
      x86: Reduce clock calibration time during slave cpu startup
      x86/config: Revamp configuration for MID devices
      x86/sfi: Kill the IRQ as id hack
  4. @torvalds

    Merge branch 'x86-mm-for-linus' of git://…

    torvalds authored
    * 'x86-mm-for-linus' of git://
      x86/numa: Add constraints check for nid parameters
      mm, x86: Remove debug_pagealloc_enabled
      x86/mm: Initialize high mem before free_all_bootmem()
      arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
      arch/x86/kernel/e820.c: Eliminate bubble sort from sanitize_e820_map()
      x86: Fix mmap random address range
      x86, mm: Unify zone_sizes_init()
      x86, mm: Prepare zone_sizes_init() for unification
      x86, mm: Use max_low_pfn for ZONE_NORMAL on 64-bit
      x86, mm: Wrap ZONE_DMA32 with CONFIG_ZONE_DMA32
      x86, mm: Use max_pfn instead of highend_pfn
      x86, mm: Move zone init from paging_init() on 64-bit
      x86, mm: Use MAX_DMA_PFN for ZONE_DMA on 32-bit
Commits on Jan 10, 2012
  1. @torvalds

    Merge branch 'nfs-for-3.3' of git://…

    torvalds authored
    * 'nfs-for-3.3' of git://
      NFSv4: Change the default setting of the nfs4_disable_idmapping parameter
      NFSv4: Save the owner/group name string when doing open
      NFS: Remove pNFS bloat from the generic write path
      pnfs-obj: Must return layout on IO error
      pnfs-obj: pNFS errors are communicated on iodata->pnfs_error
      NFS: Cache state owners after files are closed
      NFS: Clean up nfs4_find_state_owners_locked()
      NFSv4: include bitmap in nfsv4 get acl data
      nfs: fix a minor do_div portability issue
      NFSv4.1: cleanup comment and debug printk
      NFSv4.1: change nfs4_free_slot parameters for dynamic slots
      NFSv4.1: cleanup init and reset of session slot tables
      NFSv4.1: fix backchannel slotid off-by-one bug
      nfs: fix regression in handling of context= option in NFSv4
      NFS - fix recent breakage to NFS error handling.
      NFS: Retry mounting NFSROOT
      SUNRPC: Clean up the RPCSEC_GSS service ticket requests
  2. @fabioestevam

    sched: Fix CONFIG_CGROUP_SCHED dependency

    fabioestevam authored Ingo Molnar committed
    The dependency bug was pointed out by this build warning:
     warning: (SCHED_AUTOGROUP) selects CGROUP_SCHED which has unmet direct dependencies (CGROUPS && EXPERIMENTAL)
    Signed-off-by: Fabio Estevam <>
    Cc: Fabio Estevam <>
    Signed-off-by: Ingo Molnar <>
Something went wrong with that request. Please try again.