15 Dec, 2009

9 commits

  • Global variable declarations must match the definitions in section attributes
    as the compiler is at liberty to vary the method it uses to access a variable,
    depending on the section it is in.

    When building the FRV arch, I now see:

    drivers/built-in.o: In function `pci_apply_final_quirks':
    drivers/pci/quirks.c:2606: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o
    drivers/pci/quirks.c:2623: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o
    drivers/pci/quirks.c:2630: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o

    because the declaration of pci_dfl_cache_line_size in linux/pci.h does not
    match the definition in drivers/pci/pci.c.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • If there is no hardware breakpoint support, modify_user_hw_breakpoint()
    tries to return a NULL pointer through as an 'int' return value:

    In file included from kernel/exit.c:53:
    include/linux/hw_breakpoint.h: In function 'modify_user_hw_breakpoint':
    include/linux/hw_breakpoint.h:96: warning: return makes integer from pointer without a cast

    Return 0 instead.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (46 commits)
    microblaze: Remove rt_sigsuspend wrapper
    microblaze: nommu: Don't clobber R11 on syscalls
    microblaze: Remove show_tmem function
    microblaze: Support for WB cache
    microblaze: Add PVR for Microblaze v7.30.a
    microblaze: Remove ancient and fake microblaze version from cpu_ver table
    microblaze: Remove panic_timeout init value
    microblaze: Do not count system calls in default
    microblaze: Enable DTC compilation
    microblaze: Core oprofile configs and hooks
    microblaze: Fix level interrupt ACKing
    microblaze: Enable futimesat syscall
    microblaze: Checking DTS against PVR for write-back cache
    microblaze: Remove duplicity from pgalloc.h
    microblaze: Futex support
    microblaze: Adding dev_arch_data functions
    microblaze: Fix the heartbeat gpio to be more robust
    microblaze: Simple __copy_tofrom_user for noMMU
    microblaze: Export memory_start for modules
    microblaze: Use lowest-common-denominator default CPU settings
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://neil.brown.name/md: (27 commits)
    md: add 'recovery_start' per-device sysfs attribute
    md: rcu_read_lock() walk of mddev->disks in md_do_sync()
    md: integrate spares into array at earliest opportunity.
    md: move compat_ioctl handling into md.c
    md: revise Kconfig help for MD_MULTIPATH
    md: add MODULE_DESCRIPTION for all md related modules.
    raid: improve MD/raid10 handling of correctable read errors.
    md/raid10: print more useful messages on device failure.
    md/bitmap: update dirty flag when bitmap bits are explicitly set.
    md: Support write-intent bitmaps with externally managed metadata.
    md/bitmap: move setting of daemon_lastrun out of bitmap_read_sb
    md: support updating bitmap parameters via sysfs.
    md: factor out parsing of fixed-point numbers
    md: support bitmap offset appropriate for external-metadata arrays.
    md: remove needless setting of thread->timeout in raid10_quiesce
    md: change daemon_sleep to be in 'jiffies' rather than 'seconds'.
    md: move offset, daemon_sleep and chunksize out of bitmap structure
    md: collect bitmap-specific fields into one structure.
    md/raid1: add takeover support for raid5->raid1
    md: add honouring of suspend_{lo,hi} to raid1.
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (58 commits)
    mfd: Add twl6030 regulator subdevices
    regulator: Add support for twl6030 regulators
    rtc: Add twl6030 RTC support
    mfd: Add support for twl6030 irq framework
    mfd: Rename twl4030_ routines in twl-regulator.c
    mfd: Rename twl4030_ routines in rtc-twl.c
    mfd: Rename all twl4030_i2c*
    mfd: Rename twl4030* driver files to enable re-use
    mfd: Clarify twl4030 return value for read and write
    mfd: Add all twl4030 regulators to the twl4030 mfd driver
    mfd: Don't set mc13783 ADREFMODE for touch conversions
    mfd: Remove ezx-pcap defines for custom led gpio encoding
    mfd: Near complete mc13783 rewrite
    mfd: Remove build time warning for WM835x register default tables
    mfd: Force I2C to be built in when building WM831x
    mfd: Don't allow wm831x to be built as a module
    mfd: Fix incorrect error check for wm8350-core
    mfd: Fix twl4030 warning
    gpiolib: Implement gpio_to_irq() for wm831x
    mfd: Remove default selection of AB4500
    ...

    Linus Torvalds
     
  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: fix lh7a40x build
    ARM: fix sa1100 build
    ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
    ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions
    ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
    [ARM] pxa/zeus: default configuration for Arcom Zeus SBC.
    [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
    [ARM] pxa/zeus: basic support for Arcom Zeus SBC
    [ARM] pxa/em-x270: fix usb hub power up/reset sequence
    PCMCIA: fix pxa2xx_lubbock modular build error
    ARM: RealView: Fix typo in the RealView/PBX Kconfig entry
    ARM: Do not allow the probing of the local timer
    ARM: Add an earlyprintk debug console

    Linus Torvalds
     
  • * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (75 commits)
    NFS: Fix nfs_migrate_page()
    rpc: remove unneeded function parameter in gss_add_msg()
    nfs41: Invoke RECLAIM_COMPLETE on all new client ids
    SUNRPC: IS_ERR/PTR_ERR confusion
    NFSv41: Fix a potential state leakage when restarting nfs4_close_prepare
    nfs41: Handle NFSv4.1 session errors in the delegation recall code
    nfs41: Retry delegation return if it failed with session error
    nfs41: Handle session errors during delegation return
    nfs41: Mark stateids in need of reclaim if state manager gets stale clientid
    NFS: Fix up the declaration of nfs4_restart_rpc when NFSv4 not configured
    nfs41: Don't clear DRAINING flag on NFS4ERR_STALE_CLIENTID
    nfs41: nfs41_setup_state_renewal
    NFSv41: More cleanups
    NFSv41: Fix up some bugs in the NFS4CLNT_SESSION_DRAINING code
    NFSv41: Clean up slot table management
    NFSv41: Fix nfs4_proc_create_session
    nfs41: Invoke RECLAIM_COMPLETE
    nfs41: RECLAIM_COMPLETE functionality
    nfs41: RECLAIM_COMPLETE XDR functionality
    Cleanup some NFSv4 XDR decode comments
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)
    m68k: rename global variable vmalloc_end to m68k_vmalloc_end
    percpu: add missing per_cpu_ptr_to_phys() definition for UP
    percpu: Fix kdump failure if booted with percpu_alloc=page
    percpu: make misc percpu symbols unique
    percpu: make percpu symbols in ia64 unique
    percpu: make percpu symbols in powerpc unique
    percpu: make percpu symbols in x86 unique
    percpu: make percpu symbols in xen unique
    percpu: make percpu symbols in cpufreq unique
    percpu: make percpu symbols in oprofile unique
    percpu: make percpu symbols in tracer unique
    percpu: make percpu symbols under kernel/ and mm/ unique
    percpu: remove some sparse warnings
    percpu: make alloc_percpu() handle array types
    vmalloc: fix use of non-existent percpu variable in put_cpu_var()
    this_cpu: Use this_cpu_xx in trace_functions_graph.c
    this_cpu: Use this_cpu_xx for ftrace
    this_cpu: Use this_cpu_xx in nmi handling
    this_cpu: Use this_cpu operations in RCU
    this_cpu: Use this_cpu ops for VM statistics
    ...

    Fix up trivial (famous last words) global per-cpu naming conflicts in
    arch/x86/kvm/svm.c
    mm/slab.c

    Linus Torvalds
     
  • In recent months, two different network projects erroneously
    strayed down the rw_lock path. Update the Documentation
    based upon comments by Eric Dumazet and Paul E. McKenney in
    those threads.

    Further updates await somebody else with more expertise.

    Changes:
    - Merged with extensive content by Stephen Hemminger.
    - Fix one of the comments by Linus Torvalds.

    Signed-off-by: William.Allen.Simpson@gmail.com
    Acked-by: Paul E. McKenney
    Signed-off-by: Linus Torvalds

    William Allen Simpson
     

14 Dec, 2009

31 commits