06 Aug, 2010

15 commits

  • This patch adds a missing kfree(dmi_dev) in dmi_id_init error path.

    Signed-off-by: Axel Lin
    Acked-by: Tejun Heo
    Signed-off-by: Greg Kroah-Hartman

    Axel Lin
     
  • sysfs_chmod_file doesn't change the attribute it operates on, so this
    attribute can be marked const.

    Signed-off-by: Jean Delvare
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • Update the in-kernel hotplug example script to work
    properly with recent kernels. Without this fix the
    script may load the firmware twice - both at "add"
    and "remove" time.

    The second load only triggers in the case when multiple
    firmware images are used. A good example is the b43
    driver which does not work properly without this fix.

    Signed-off-by: Magnus Damm
    Signed-off-by: Greg Kroah-Hartman

    Magnus Damm
     
  • Platform devices should only be called by init code, so it should be
    possible to move creation helpers to .init.text -- at least if modules
    are disabled.

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Greg Kroah-Hartman

    Uwe Kleine-König
     
  • This makes the two similar functions platform_device_register_simple
    and platform_device_register_data one line inline functions using a new
    generic function platform_device_register_resndata.

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Greg Kroah-Hartman

    Uwe Kleine-König
     
  • This makes platform_device_add_resources look like
    platform_device_add_data.

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Greg Kroah-Hartman

    Uwe Kleine-König
     
  • Both these structures have the same lifetime rules so instead of allocating
    and managing them separately embed struct device into struct firmware_priv.
    Also make sure to delete sysfs attributes ourselves instead of expecting
    sysfs to clean up our mess.

    Signed-off-by: Dmitry Torokhov
    Signed-off-by: Greg Kroah-Hartman

    Dmitry Torokhov
     
  • There is no reason why we are using a template for binary attribute
    and copying it into per-firmware data before registering. Using the
    original works as well.

    Signed-off-by: Dmitry Torokhov
    Signed-off-by: Greg Kroah-Hartman

    Dmitry Torokhov
     
  • There is little rationale for marking bus_for_each_drv() __must_check.
    It is more of an iteration helper than a real function. You don't know
    in advance which callback it will be used on, so you have no clue how
    important it can be to check the returned value. In practice, this
    helper function can be used for best-effort tasks.

    As a matter of fact, bus_for_each_dev() is not marked __must_check.
    So remove it from bus_for_each_drv() as well. This is the same that
    was done back in October 2006 by Russell King for
    device_for_each_child(), for exactly the same reasons.

    Signed-off-by: Jean Delvare
    Cc: Andrew Morton
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • struct dma_coherent_mem in drivers/base/dma-coherent.c
    has member 'device_base' that is of type u32,
    but is assigned value of type dma_addr_t, which may be
    64 bits for x86_64. Change the type to dma_addr_t.

    Signed-off-by: Marin Mitov
    Signed-off-by: Greg Kroah-Hartman

    Marin Mitov
     
  • The kernel/hotplug sysctl variable (/proc/sys/kernel/hotplug file) was
    made conditional on CONFIG_NET by commit
    f743ca5e10f4145e0b3e6d11b9b46171e16af7ce (applied in 2.6.18) to fix
    problems with undefined references in 2.6.16 when CONFIG_HOTPLUG=y &&
    !CONFIG_NET, but this restriction is no longer needed.

    This patch makes the kernel/hotplug sysctl variable depend only on
    CONFIG_HOTPLUG.

    Signed-off-by: Ian Abbott
    Acked-by: Randy Dunlap
    Signed-off-by: Greg Kroah-Hartman

    Ian Abbott
     
  • Remove IRQF_DISABLED since it is deprecated and a no-op in the
    current kernel.

    Signed-off-by: Hans J. Koch
    Signed-off-by: Greg Kroah-Hartman

    Hans J. Koch
     
  • Remove IRQF_DISABLED since it is deprecated and a no-op in the
    current kernel.

    Signed-off-by: Hans J. Koch
    Acked-by: John Ogness
    Signed-off-by: Greg Kroah-Hartman

    Hans J. Koch
     
  • Remove IRQF_DISABLED flag since it is deprecated and a no-op in the
    current kernel.

    Signed-off-by: Hans J. Koch
    Signed-off-by: Greg Kroah-Hartman

    Hans J. Koch
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (79 commits)
    powerpc/8xx: Add support for the MPC8xx based boards from TQC
    powerpc/85xx: Introduce support for the Freescale P1022DS reference board
    powerpc/85xx: Adding DTS for the STx GP3-SSA MPC8555 board
    powerpc/85xx: Change deprecated binding for 85xx-based boards
    powerpc/tqm85xx: add a quirk for ti1520 PCMCIA bridge
    powerpc/tqm85xx: update PCI interrupt-map attribute
    powerpc/mpc8308rdb: support for MPC8308RDB board from Freescale
    powerpc/fsl_pci: add quirk for mpc8308 pcie bridge
    powerpc/85xx: Cleanup QE initialization for MPC85xxMDS boards
    powerpc/85xx: Fix booting for P1021MDS boards
    powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards
    powerpc/85xx: kexec for SMP 85xx BookE systems
    powerpc/5200/i2c: improve i2c bus error recovery
    of/xilinxfb: update tft compatible versions
    powerpc/fsl-diu-fb: Support setting display mode using EDID
    powerpc/5121: doc/dts-bindings: update doc of FSL DIU bindings
    powerpc/5121: shared DIU framebuffer support
    powerpc/5121: move fsl-diu-fb.h to include/linux
    powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor
    powerpc/512x: add clock structure for Video-IN (VIU) unit
    ...

    Linus Torvalds
     

05 Aug, 2010

25 commits

  • * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (49 commits)
    microblaze: Add KGDB support
    microblaze: Support brki rX, 0x18 for user application debugging
    microblaze: Remove nop after MSRCLR/SET, MTS, MFS instructions
    microblaze: Simplify syscall rutine
    microblaze: Move PT_MODE saving to delay slot
    microblaze: Fix _interrupt function
    microblaze: Fix _user_exception function
    microblaze: Put together addik instructions
    microblaze: Use delay slot in syscall macros
    microblaze: Save kernel mode in delay slot
    microblaze: Do not mix register saving and mode setting
    microblaze: Move SAVE_STATE upward
    microblaze: entry.S: Macro optimization
    microblaze: Optimize hw exception rutine
    microblaze: Implement clear_ums macro and fix SAVE_STATE macro
    microblaze: Remove additional setup for kernel_mode
    microblaze: Optimize SAVE_STATE macro
    microblaze: Remove additional loading
    microblaze: Completely remove working with R11 register
    microblaze: Do not setup BIP in _debug_exception
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    arch/sparc/mm: Use GFP_KERNEL
    MAINTAINERS: Add trailing slash to SBUS path.
    sbus: autoconvert trivial BKL users to private mutex

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] increase ia64 static per cpu area
    [IA64] Put ia64 config files on the Uwe Kleine-König diet
    [IA64] perfmon: convert to unlocked_ioctl
    [IA64] beautify vmlinux.lds.h

    Linus Torvalds
     
  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (150 commits)
    MIPS: PowerTV: Separate PowerTV USB support from non-USB code
    MIPS: strip the un-needed sections of vmlinuz
    MIPS: Clean up the calculation of VMLINUZ_LOAD_ADDRESS
    MIPS: Clean up arch/mips/boot/compressed/decompress.c
    MIPS: Clean up arch/mips/boot/compressed/ld.script
    MIPS: Unify the suffix of compressed vmlinux.bin
    MIPS: PowerTV: Add Gaia platform definitions.
    MIPS: BCM47xx: Fix nvram_getenv return value.
    MIPS: Octeon: Allow more than 3.75GB of memory with PCIe
    MIPS: Clean up notify_die() usage.
    MIPS: Remove unused task_struct.trap_no field.
    Documentation: Mention that KProbes is supported on MIPS
    SAMPLES: kprobe_example: Make it print something on MIPS.
    MIPS: kprobe: Add support.
    MIPS: Add instrunction format for BREAK and SYSCALL
    MIPS: kprobes: Define regs_return_value()
    MIPS: Ritually kill stupid printk.
    MIPS: Octeon: Disallow MSI-X interrupt and fall back to MSI interrupts.
    MIPS: Octeon: Support 256 MSI on PCIe
    MIPS: Decode core number for R2 CPUs.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
    xtensa: Disable PCI and nfsroot on simulation target
    xtensa: Add missing include in coprocessor.h
    xtensa: Fix the network driver for the simulator target
    xtensa: Shuffle include statements to fix linker script
    xtensa: Add -mforce-no-pic option is supported
    xtensa: Fixes due to bss boundary symbol name changes.
    xtensa: Fix linker script patch-up
    xtensa: Fix FLUSH_DCACHE macro for some variants.

    Linus Torvalds
     
  • Signed-off-by: Nick Piggin
    Signed-off-by: Linus Torvalds

    Nick Piggin
     
  • Separate USB code into a file separate from asic/asic_devices.

    Separating the USB code from everything else in asic/asic_devices.c goes
    a long way toward reducing the use of that file as a dumping ground for
    everything that didn't seem to fit anywhere else.

    Signed-off-by: David VomLehn
    To: linux-mips@linux-mips.org
    Cc: greg@kroah.com
    Cc: linux-usb@vger.kernel.org
    Patchwork: http://patchwork.linux-mips.org/patch/1522/
    Signed-off-by: Ralf Baechle

    David VomLehn
     
  • This patch use "strip -s" to strip the .symtab and .strtab sections of
    vmlinuz.

    Note: This patch is based on http://patchwork.linux-mips.org/patch/1324/

    Signed-off-by: Wu Zhangjin
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1383/
    Signed-off-by: Ralf Baechle

    Wu Zhangjin
     
  • We have calculated VMLINUZ_LOAD_ADDRESS in shell, which is indecipherable. This
    patch rewrites it in C.

    Signed-off-by: Wu Zhangjin
    To: linux-mips
    Cc: Alexander Clouter
    Cc: Manuel Lauss
    Cc: Sam Ravnborg
    Acked-by: Sam Ravnborg
    Reviewed-by: Alexander Clouter
    Patchwork: https://patchwork.linux-mips.org/patch/1324/
    Signed-off-by: Ralf Baechle

    Wu Zhangjin
     
  • - Remove several outdated comments
    - Clearify the definition of zimage_start and zimage_size and the their
    usage

    Signed-off-by: Wu Zhangjin
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1382/
    Signed-off-by: Ralf Baechle

    Wu Zhangjin
     
  • - Remove unused symbols: _fdata, _text; only _edata and _end are needed by
    head.S
    - Remove unused sections: .sbss, .stab, .gptab.sdata, .gptab.sbss
    - Change the alignment to 16 bytes to ensure it is greater than any
    fundamental type of a MIPS compiler.
    - Clean up comments

    Signed-off-by: Wu Zhangjin
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1381/
    Signed-off-by: Ralf Baechle

    Wu Zhangjin
     
  • The compressed vmlinux.bin is only a temp file so it's ok to use the same
    suffix .z for them (.gz,.lzo,.lzma...) to remove several lines and simpify
    the maintenance (no need to add the "suffix_$(xxx) := suffix" line).

    Signed-off-by: Wu Zhangjin
    To: linux-mips
    Cc: Alexander Clouter
    Cc: Manuel Lauss
    Cc: Sam Ravnborg
    Patchwork: https://patchwork.linux-mips.org/patch/1323/
    Signed-off-by: Ralf Baechle

    ---

    Wu Zhangjin
     
  • Define ASIC address, memory preallocations, and initialization code for the
    Gaia platform.

    Signed-off-by: David VomLehn
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1519/
    Signed-off-by: Ralf Baechle

    David VomLehn
     
  • Nvram_getenv should behave like cfe_getenv. cfe_getenv returns 0 on
    success and -9 if the value was not found. If the input was wrong -8
    will be returned by cfe_getenv. Change nvram_getenv to do the same.

    Signed-off-by: Hauke Mehrtens
    Cc: Waldemar Brodkorb
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1520/
    Signed-off-by: Ralf Baechle

    Hauke Mehrtens
     
  • We reserve the 3.75GB - 4GB region of PCIe address space for device to
    device transfers, making the corresponding physical memory under
    direct mapping unavailable for DMA.

    To allow for PCIe DMA to all physical memory we map this chunk of
    physical memory with BAR1. Because of the resulting discontinuity in
    the mapping function, we remove a page of memory at each end of the
    range so multi-page DMA buffers can never be allocated that span the
    range.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1535/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • The sixth argument of notify_die() is a signal number, the fifth is a
    trap number.

    Instead of passing a signal number in a randomly selected argument,
    pass it in the sixth. Extract the exception code from regs and pass
    that as the trap number.

    Get rid of redundant cast, and remove some gratuitous spaces.

    Nobody actually does anything with the signal number or trap number,
    but we might as well populate them with sensible values.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1532/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • It is initialized to zero and only ever read. Remove it, and pass zero in
    its place.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/1531/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • MIPS now has KProbes support, so kprobes.txt should reflect it.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    To: ananth@in.ibm.com
    To: anil.s.keshavamurthy@intel.com
    To: davem@davemloft.net
    To: masami.hiramatsu.pt@hitachi.com
    Cc: linux-kernel@vger.kernel.org
    Cc: hschauhan@nulltrace.org
    Patchwork: https://patchwork.linux-mips.org/patch/1527/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • This KProbes example is a little useless if it doesn't print anything.
    For MIPS print similar messages to those produced on x86 and PPC.

    Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    To: ananth@in.ibm.com
    To: anil.s.keshavamurthy@intel.com
    To: davem@davemloft.net
    To: masami.hiramatsu.pt@hitachi.com
    Cc: linux-kernel@vger.kernel.org
    Cc: hschauhan@nulltrace.org
    Patchwork: https://patchwork.linux-mips.org/patch/1528/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • This patch is based on previous work by Sony and Himanshu Chauhan.

    I have done some cleanup and implemented JProbes and KRETPROBES. The
    KRETPROBES part is pretty much copied verbatim from powerpc. A possible
    future enhance might be to factor out the common code.

    Signed-off-by: David Daney
    Cc: Himanshu Chauhan
    To: linux-mips@linux-mips.org
    To: ananth@in.ibm.com,
    To: anil.s.keshavamurthy@intel.com
    To: davem@davemloft.net
    To: masami.hiramatsu.pt@hitachi.com
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/1525/
    Patchwork: https://patchwork.linux-mips.org/patch/1530/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    To: ananth@in.ibm.com
    To: anil.s.keshavamurthy@intel.com
    To: davem@davemloft.net
    To: masami.hiramatsu.pt@hitachi.com
    Cc: linux-kernel@vger.kernel.org
    Cc: hschauhan@nulltrace.org
    Patchwork: https://patchwork.linux-mips.org/patch/1524/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    To: ananth@in.ibm.com
    To: anil.s.keshavamurthy@intel.com
    To: davem@davemloft.net
    To: masami.hiramatsu.pt@hitachi.com
    Cc: linux-kernel@vger.kernel.org,
    Cc: hschauhan@nulltrace.org
    Patchwork: https://patchwork.linux-mips.org/patch/1529/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • This belongs into userland.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • MSI-X interrupts are not supported yet for Octeon, return error if
    MSI-X interrupts are requested by driver so that the driver will fall
    back to use MSI interrupts.

    Signed-off-by: Chandrakala Chavva
    To: linux-mips@linux-mips.org
    Cc: David Daney
    Patchwork: https://patchwork.linux-mips.org/patch/1506/
    Signed-off-by: Ralf Baechle
    Signed-off-by: David Daney

    Chandrakala Chavva
     
  • Signed-off-by: David Daney
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/1507/
    Signed-off-by: Ralf Baechle

    David Daney