21 Dec, 2012

1 commit

  • Pull IOMMU updates from Joerg Roedel:
    "A few new features this merge-window. The most important one is
    probably, that dma-debug now warns if a dma-handle is not checked with
    dma_mapping_error by the device driver. This requires minor changes
    to some architectures which make use of dma-debug. Most of these
    changes have the respective Acks by the Arch-Maintainers.

    Besides that there are updates to the AMD IOMMU driver for refactor
    the IOMMU-Groups support and to make sure it does not trigger a
    hardware erratum.

    The OMAP changes (for which I pulled in a branch from Tony Lindgren's
    tree) have a conflict in linux-next with the arm-soc tree. The
    conflict is in the file arch/arm/mach-omap2/clock44xx_data.c which is
    deleted in the arm-soc tree. It is safe to delete the file too so
    solve the conflict. Similar changes are done in the arm-soc tree in
    the common clock framework migration. A missing hunk from the patch
    in the IOMMU tree will be submitted as a seperate patch when the
    merge-window is closed."

    * tag 'iommu-updates-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (29 commits)
    ARM: dma-mapping: support debug_dma_mapping_error
    ARM: OMAP4: hwmod data: ipu and dsp to use parent clocks instead of leaf clocks
    iommu/omap: Adapt to runtime pm
    iommu/omap: Migrate to hwmod framework
    iommu/omap: Keep mmu enabled when requested
    iommu/omap: Remove redundant clock handling on ISR
    iommu/amd: Remove obsolete comment
    iommu/amd: Don't use 512GB pages
    iommu/tegra: smmu: Move bus_set_iommu after probe for multi arch
    iommu/tegra: gart: Move bus_set_iommu after probe for multi arch
    iommu/tegra: smmu: Remove unnecessary PTC/TLB flush all
    tile: dma_debug: add debug_dma_mapping_error support
    sh: dma_debug: add debug_dma_mapping_error support
    powerpc: dma_debug: add debug_dma_mapping_error support
    mips: dma_debug: add debug_dma_mapping_error support
    microblaze: dma-mapping: support debug_dma_mapping_error
    ia64: dma_debug: add debug_dma_mapping_error support
    c6x: dma_debug: add debug_dma_mapping_error support
    ARM64: dma_debug: add debug_dma_mapping_error support
    intel-iommu: Prevent devices with RMRRs from being placed into SI Domain
    ...

    Linus Torvalds
     

16 Dec, 2012

1 commit


15 Dec, 2012

1 commit

  • Pull MIPS updates from Ralf Baechle:
    "The MIPS bits for 3.8. This also includes a bunch fixes that were
    sitting in the linux-mips.org git tree for a long time. This pull
    request contains updates to several OCTEON drivers and the board
    support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
    updates to the SSB bus support, MIPS kexec code and adds support for
    kdump.

    When pulling this, there are two expected merge conflicts in
    include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
    resolve, just remove the conflict markers and keep both alternatives."

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
    MIPS: PMC-Sierra Yosemite: Remove support.
    VIDEO: Newport Fix console crashes
    MIPS: wrppmc: Fix build of PCI code.
    MIPS: IP22/IP28: Fix build of EISA code.
    MIPS: RB532: Fix build of prom code.
    MIPS: PowerTV: Fix build.
    MIPS: IP27: Correct fucked grammar in ops-bridge.c
    MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
    MIPS: Fix potencial corruption
    MIPS: Fix for warning from FPU emulation code
    MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
    MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
    MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
    MIPS: Remove unused smvp.h
    MIPS/EDAC: Improve OCTEON EDAC support.
    MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
    MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
    ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
    MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
    MIPS: Remove usage of CEVT_R4K_LIB config option.
    ...

    Linus Torvalds
     

14 Dec, 2012

26 commits

  • Merge misc VM changes from Andrew Morton:
    "The rest of most-of-MM. The other MM bits await a slab merge.

    This patch includes the addition of a huge zero_page. Not a
    performance boost but it an save large amounts of physical memory in
    some situations.

    Also a bunch of Fujitsu engineers are working on memory hotplug.
    Which, as it turns out, was badly broken. About half of their patches
    are included here; the remainder are 3.8 material."

    However, this merge disables CONFIG_MOVABLE_NODE, which was totally
    broken. We don't add new features with "default y", nor do we add
    Kconfig questions that are incomprehensible to most people without any
    help text. Does the feature even make sense without compaction or
    memory hotplug?

    * akpm: (54 commits)
    mm/bootmem.c: remove unused wrapper function reserve_bootmem_generic()
    mm/memory.c: remove unused code from do_wp_page()
    asm-generic, mm: pgtable: consolidate zero page helpers
    mm/hugetlb.c: fix warning on freeing hwpoisoned hugepage
    hwpoison, hugetlbfs: fix RSS-counter warning
    hwpoison, hugetlbfs: fix "bad pmd" warning in unmapping hwpoisoned hugepage
    mm: protect against concurrent vma expansion
    memcg: do not check for mm in __mem_cgroup_count_vm_event
    tmpfs: support SEEK_DATA and SEEK_HOLE (reprise)
    mm: provide more accurate estimation of pages occupied by memmap
    fs/buffer.c: remove redundant initialization in alloc_page_buffers()
    fs/buffer.c: do not inline exported function
    writeback: fix a typo in comment
    mm: introduce new field "managed_pages" to struct zone
    mm, oom: remove statically defined arch functions of same name
    mm, oom: remove redundant sleep in pagefault oom handler
    mm, oom: cleanup pagefault oom handler
    memory_hotplug: allow online/offline memory to result movable node
    numa: add CONFIG_MOVABLE_NODE for movable-dedicated node
    mm, memcg: avoid unnecessary function call when memcg is disabled
    ...

    Linus Torvalds
     
  • Pull trivial branch from Jiri Kosina:
    "Usual stuff -- comment/printk typo fixes, documentation updates, dead
    code elimination."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    HOWTO: fix double words typo
    x86 mtrr: fix comment typo in mtrr_bp_init
    propagate name change to comments in kernel source
    doc: Update the name of profiling based on sysfs
    treewide: Fix typos in various drivers
    treewide: Fix typos in various Kconfig
    wireless: mwifiex: Fix typo in wireless/mwifiex driver
    messages: i2o: Fix typo in messages/i2o
    scripts/kernel-doc: check that non-void fcts describe their return value
    Kernel-doc: Convention: Use a "Return" section to describe return values
    radeon: Fix typo and copy/paste error in comments
    doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
    various: Fix spelling of "asynchronous" in comments.
    Fix misspellings of "whether" in comments.
    eisa: Fix spelling of "asynchronous".
    various: Fix spelling of "registered" in comments.
    doc: fix quite a few typos within Documentation
    target: iscsi: fix comment typos in target/iscsi drivers
    treewide: fix typo of "suport" in various comments and Kconfig
    treewide: fix typo of "suppport" in various comments
    ...

    Linus Torvalds
     
  • Ralf Baechle
     
  • Nobody seems to be interested anymore and upstream also never had an
    ethernet driver.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • CC arch/mips/wrppmc/pci.o
    /home/ralf/src/linux/linux-mips/arch/mips/wrppmc/pci.c: In function ‘gt64120_pci_init’:
    /home/ralf/src/linux/linux-mips/arch/mips/wrppmc/pci.c:41:6: error: variable ‘tmp’ set but not used [-Werror=unused-but-set-variable]
    cc1: all warnings being treated as errors

    This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use
    -Wunused-but-set-variable to suppress it.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • CC arch/mips/sgi-ip22/ip22-eisa.o
    /home/ralf/src/linux/linux-mips/arch/mips/sgi-ip22/ip22-eisa.c: In function ‘ip22_eisa_intr’:
    /home/ralf/src/linux/linux-mips/arch/mips/sgi-ip22/ip22-eisa.c:77:11: error: variable ‘dma2’ set but not used [-Werror=unused-but-set-variable]
    /home/ralf/src/linux/linux-mips/arch/mips/sgi-ip22/ip22-eisa.c:77:5: error: variable ‘dma1’ set but not used [-Werror=unused-but-set-variable]
    cc1: all warnings being treated as errors

    This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use
    -Wunused-but-set-variable to suppress it.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • CC arch/mips/rb532/prom.o
    /home/ralf/src/linux/linux-mips/arch/mips/rb532/prom.c: In function ‘prom_setup_cmdline’:
    /home/ralf/src/linux/linux-mips/arch/mips/rb532/prom.c:75:22: error: variable ‘prom_envp’ set but not used [-Werror=unused-but-set-variable]

    This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use
    -Wunused-but-set-variable to suppress it.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • CC arch/mips/powertv/init.o
    /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_nmi_setup’:
    /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:80:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable]
    /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c: In function ‘mips_ejtag_setup’:
    /home/ralf/src/linux/linux-mips/arch/mips/powertv/init.c:94:8: error: variable ‘base’ set but not used [-Werror=unused-but-set-variable]
    cc1: all warnings being treated as errors

    As these two functions are, they don't serve any useful purpose so I've
    deleted them entirely.

    This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use
    -Wunused-but-set-variable to suppress it.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • I had no idea just how broken IOC3 was until I read this.

    Signed-off-by: Dave Jones
    Signed-off-by: Ralf Baechle

    Dave Jones
     
  • CC arch/mips/mm/highmem.o
    /home/ralf/src/linux/linux-mips/arch/mips/mm/highmem.c: In function ‘__kunmap_atomic’:
    /home/ralf/src/linux/linux-mips/arch/mips/mm/highmem.c:70:6: error: variable ‘type’ set but not used [-Werror=unused-but-set-variable]
    cc1: all warnings being treated as errors

    This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use
    -Wunused-but-set-variable to suppress it.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Normally r4k_dma_cache_inv should only ever be called with cacheline
    aligned addresses. If however, it isn't there is the theoretical
    possibility of data corruption. There is no correct way of handling this
    and anyway, it should only happen if the DMA API is used incorrectly
    so drop

    There is a different corruption scenario with these CACHE instructions
    removed but again there is no way of handling this correctly and it can
    be triggered only through incorrect use of the DMA API.

    So just get rid of the complexity.

    Signed-off-by: Ralf Baechle
    Reported-by: James Rodriguez

    Ralf Baechle
     
  • The default implementation of 'cpu_has_fpu' macro calls
    smp_processor_id() which causes this warning to be printed when
    preemption is enabled:

    [ 4.664000] Algorithmics/MIPS FPU Emulator v1.5
    [ 4.676000] BUG: using smp_processor_id() in preemptible [00000000] code: ini
    [ 4.700000] caller is fpu_emulator_cop1Handler+0x434/0x27b8

    This problem got introduced in November 2009 by
    af1d2af877ef6c36990671bc86a5b9c5bb50b1da (lmo) [MIPS: Fix emulation of
    64-bit FPU on 64-bit CPUs.] rsp. da0bac33413b2888d3623dad3ad19ce76b688f07
    (kernel.org) [MIPS: Fix emulation of 64-bit FPU on FPU-less 64-bit CPUs.]
    in 2.6.32.

    Fixed by rewriting cop1_64bit() to return a constant whenever possible
    but most importantly avoid the use pf cpu_has_fpu entirely.

    Signed-off-by: Ralf Baechle
    Reported-by: Jayachandran C
    Initial-patch-by: Jayachandran C
    Patchwork: https://patchwork.linux-mips.org/patch/4225/

    Ralf Baechle
     
  • Our FP emulator is hardcoded for the MIPS IV FP instruction set and does
    not match the FP ISA with the general ISA. However for the few MIPS IV FP
    instructions that use the COP1X major opcode it relies on the Coprocessor
    Unusable exception to be delivered as a COP1 rather than COP3 exception.
    This includes indexed transfer (LDXC1, etc.) and FP multiply-accumulate
    (MADD.D, etc.) instructions.

    All the MIPS I, II, III and IV processors and some newer chips that do not
    implement the FPU use the COP3 exception however. Therefore I believe the
    kernel should follow and redirect any COP3 Unusable traps to the emulator
    unless an actual FPU part or core is present.

    This is a change that implements it. Any minor opcode encodings that are
    not recognised as valid FP instructions are rejected by the emulator and
    will result in a SIGILL signal being delivered as they currently do. We
    do not support vendor-specific coprocessor 3 implementations supported
    with MIPS I and MIPS II ISA processors; we never set CP0.Status.CU3.

    [Ralf: On MIPS IV processors the kernel always enables the XX bit which
    replaces the CU3 bit off earlier architecture revisions.]

    If matching between the CPU and the FPU ISA is considered required one
    day, this can still be done in the emulator itself. I think the CpU
    exception dispatcher is not the right place to do this anyway, as there
    are further differences between MIPS I, MIPS II, MIPS III, MIPS IV and
    MIPS32 FP ISAs.

    Corresponding explanation of this implementation is included within the
    change itself.

    Signed-off-by: Maciej W. Rozycki
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/project/linux-mips/list/
    Signed-off-by: Ralf Baechle

    Maciej W. Rozycki
     
  • When poweroff machine, kernel_power_off() call disable_nonboot_cpus().
    And if we have HOTPLUG_CPU configured, disable_nonboot_cpus() is not an
    empty function but attempt to actually disable the nonboot cpus. Since
    system state is SYSTEM_POWER_OFF, play_dead() won't be called and thus
    disable_nonboot_cpus() hangs. Therefore, we make this patch to avoid
    poweroff failure.

    Signed-off-by: Huacai Chen
    Signed-off-by: Hongliang Tao
    Signed-off-by: Hua Yan
    Cc: Yong Zhang
    Cc: stable@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Cc: Fuxin Zhang
    Cc: Zhangjin Wu
    Patchwork: https://patchwork.linux-mips.org/patch/4211/
    Signed-off-by: Ralf Baechle

    Huacai Chen
     
  • When CONFIG_UIDGID_STRICT_TYPE_CHECKS is enabled, plain integer checking
    between different uids/gids is explicitely turned into a build failure
    by making the k{uid,gid}_t types a structure containing a value:

    arch/mips/kernel/mips-mt-fpaff.c: In function 'check_same_owner':
    arch/mips/kernel/mips-mt-fpaff.c:53:22: error: invalid operands to
    binary == (have 'kuid_t' and 'kuid_t')
    arch/mips/kernel/mips-mt-fpaff.c:54:15: error: invalid operands to
    binary == (have 'kuid_t' and 'kuid_t')

    In order to ensure proper comparison between uids, using the helper
    function uid_eq() which performs the right thing whenever this config
    option is turned on or off.

    Signed-off-by: Florian Fainelli
    Patchwork: https://patchwork.linux-mips.org/patch/4717/
    Signed-off-by: Ralf Baechle

    Florian Fainelli
     
  • This header was added in commit 39b8d5254246ac56342b72f812255c8f7a74dca9
    (kernel.org) / b6e90cd0ae7a556080d9ea2ec1b8f6d9accad9d4 (lmo( ([MIPS] Add
    support for MIPS CMP platform.). None of the functions it declared were
    ever included in the tree. Commit cb7f39d2bc5a20615d016dd86fca0fd233c13b5d
    (kernel.org) / b6e90cd0ae7a556080d9ea2ec1b8f6d9accad9d4 (lmo) [MIPS] Remove
    unused maltasmp.h.] removeed the sole file that included it because that
    file was itself unused.

    [ralf@linux-mips.org: The whole mess happened because somebody at MIPS
    thought it was a good idea to rename VSMP ("Vitual SMP") to SMVP. Which
    is an IBMeque ETLA in contrast to VSMP, so public kernels as opposed to
    MTI's inhouse kernels never followed suit.]

    Signed-off-by: Paul Bolle
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/3950/
    Signed-off-by: Ralf Baechle

    Paul Bolle
     
  • Some initialization errors are reported with the existing OCTEON EDAC
    support patch. Also some parts have more than one memory controller.

    Fix the errors and add multiple controllers if present.

    Signed-off-by: David Daney

    David Daney
     
  • Signed-off-by: David Daney

    David Daney
     
  • Used by follow-on EDAC patches.

    Signed-off-by: David Daney

    David Daney
     
  • The patch needs to eliminate the definition of OCTEON_IRQ_BOOTDMA so
    that the device tree code can map the interrupt, so in order to not
    temporarily break things, we do a single patch to both the interrupt
    registration code and the pata_octeon_cf driver.

    Also rolled in is a conversion to use hrtimers and corrections to the
    timing calculations.

    Acked-by: Jeff Garzik
    Signed-off-by: David Daney

    David Daney
     
  • Manuel Lauss writes:

    I introduced it as a fallback because early revisions of Alchemy hardware
    we shipped had a non-functional 32kHz timer and had to rely on the r4k
    timer instead. Previously the r4k timer was initialized regardless, but
    it's useless with the "wait" instruction.

    So long story short: I need either the on-chip 32kHz timer OR the r4k
    timer if the 32kHz one is unusable, but not both, and r4k timer is useless
    when au1k_idle is in use.

    The current in-kernel Alchemy boards all work with the 32kHz timer, so I'm
    not against removing R4K_LIB symbols.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Manuel Lauss writes:

    I introduced it as a fallback because early revisions of Alchemy hardware
    we shipped had a non-functional 32kHz timer and had to rely on the r4k
    timer instead. Previously the r4k timer was initialized regardless, but
    it's useless with the "wait" instruction.

    So long story short: I need either the on-chip 32kHz timer OR the r4k
    timer if the 32kHz one is unusable, but not both, and r4k timer is useless
    when au1k_idle is in use.

    The current in-kernel Alchemy boards all work with the 32kHz timer, so I'm
    not against removing R4K_LIB symbols.

    Signed-off-by: Steven J. Hill
    Signed-off-by: Ralf Baechle

    Steven J. Hill
     
  • This patch changes the physmap-flash platform data on AR7 to pass the
    correct partition parser: ar7part to used by the "physmap-flash" mapping
    driver so we get the partitions probed correctly.

    Signed-off-by: Florian Fainelli
    Cc: blogic@openwrt.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/4654/
    Signed-off-by: Ralf Baechle

    Florian Fainelli
     
  • Correct spelling typo ENDIANESS to ENDIANNESS in arc/mips/lantiq/xway/dma.c

    Signed-off-by: Masanari Iida
    Cc: trivial@kernel.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/4613/
    Signed-off-by: Ralf Baechle

    Masanari Iida
     
  • With the upcoming merge of the ARC architecture there is a small likelyhood
    of conflicting use for the CONFIG_ARC config symbol. Rename it to
    CONFIG_FW_ARC. Also rename CONFIG_ARC32 to CONFIG_FW_ARC32, CONFIG_ARC64
    to CONFIG_FW_ARC64.

    For consistence also rename CONFIG_SNIPROM to CONFIG_FW_SNIPROM and
    CONFIG_CFE to CONFIG_FW_CFE.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • [ralf@linux-mips.org: Original patch by Maxim Uvarov
    with plenty of further shining, polishing, debugging and testing by me.]

    Signed-off-by: Maxim Uvarov
    Cc: linux-mips@linux-mips.org
    Cc: kexec@lists.infradead.org
    Cc: horms@verge.net.au
    Patchwork: https://patchwork.linux-mips.org/patch/1026/
    Signed-off-by: Ralf Baechle

    Ralf Baechle
     

13 Dec, 2012

6 commits

  • [ralf@linux-mips.org: Original patch by Maxim Uvarov
    with plenty of further shining, polishing, debugging and testing by me.]

    Signed-off-by: Maxim Uvarov
    Cc: linux-mips@linux-mips.org
    Cc: kexec@lists.infradead.org
    Cc: horms@verge.net.au
    Patchwork: https://patchwork.linux-mips.org/patch/1025/
    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Pull networking changes from David Miller:

    1) Allow to dump, monitor, and change the bridge multicast database
    using netlink. From Cong Wang.

    2) RFC 5961 TCP blind data injection attack mitigation, from Eric
    Dumazet.

    3) Networking user namespace support from Eric W. Biederman.

    4) tuntap/virtio-net multiqueue support by Jason Wang.

    5) Support for checksum offload of encapsulated packets (basically,
    tunneled traffic can still be checksummed by HW). From Joseph
    Gasparakis.

    6) Allow BPF filter access to VLAN tags, from Eric Dumazet and
    Daniel Borkmann.

    7) Bridge port parameters over netlink and BPDU blocking support
    from Stephen Hemminger.

    8) Improve data access patterns during inet socket demux by rearranging
    socket layout, from Eric Dumazet.

    9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and
    Jon Maloy.

    10) Update TCP socket hash sizing to be more in line with current day
    realities. The existing heurstics were choosen a decade ago.
    From Eric Dumazet.

    11) Fix races, queue bloat, and excessive wakeups in ATM and
    associated drivers, from Krzysztof Mazur and David Woodhouse.

    12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions
    in VXLAN driver, from David Stevens.

    13) Add "oops_only" mode to netconsole, from Amerigo Wang.

    14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also
    allow DCB netlink to work on namespaces other than the initial
    namespace. From John Fastabend.

    15) Support PTP in the Tigon3 driver, from Matt Carlson.

    16) tun/vhost zero copy fixes and improvements, plus turn it on
    by default, from Michael S. Tsirkin.

    17) Support per-association statistics in SCTP, from Michele
    Baldessari.

    And many, many, driver updates, cleanups, and improvements. Too
    numerous to mention individually.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
    net/mlx4_en: Add support for destination MAC in steering rules
    net/mlx4_en: Use generic etherdevice.h functions.
    net: ethtool: Add destination MAC address to flow steering API
    bridge: add support of adding and deleting mdb entries
    bridge: notify mdb changes via netlink
    ndisc: Unexport ndisc_{build,send}_skb().
    uapi: add missing netconf.h to export list
    pkt_sched: avoid requeues if possible
    solos-pci: fix double-free of TX skb in DMA mode
    bnx2: Fix accidental reversions.
    bna: Driver Version Updated to 3.1.2.1
    bna: Firmware update
    bna: Add RX State
    bna: Rx Page Based Allocation
    bna: TX Intr Coalescing Fix
    bna: Tx and Rx Optimizations
    bna: Code Cleanup and Enhancements
    ath9k: check pdata variable before dereferencing it
    ath5k: RX timestamp is reported at end of frame
    ath9k_htc: RX timestamp is reported at end of frame
    ...

    Linus Torvalds
     
  • We have two different implementation of is_zero_pfn() and my_zero_pfn()
    helpers: for architectures with and without zero page coloring.

    Let's consolidate them in .

    Signed-off-by: Kirill A. Shutemov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kirill A. Shutemov
     
  • Pull big execve/kernel_thread/fork unification series from Al Viro:
    "All architectures are converted to new model. Quite a bit of that
    stuff is actually shared with architecture trees; in such cases it's
    literally shared branch pulled by both, not a cherry-pick.

    A lot of ugliness and black magic is gone (-3KLoC total in this one):

    - kernel_thread()/kernel_execve()/sys_execve() redesign.

    We don't do syscalls from kernel anymore for either kernel_thread()
    or kernel_execve():

    kernel_thread() is essentially clone(2) with callback run before we
    return to userland, the callbacks either never return or do
    successful do_execve() before returning.

    kernel_execve() is a wrapper for do_execve() - it doesn't need to
    do transition to user mode anymore.

    As a result kernel_thread() and kernel_execve() are
    arch-independent now - they live in kernel/fork.c and fs/exec.c
    resp. sys_execve() is also in fs/exec.c and it's completely
    architecture-independent.

    - daemonize() is gone, along with its parts in fs/*.c

    - struct pt_regs * is no longer passed to do_fork/copy_process/
    copy_thread/do_execve/search_binary_handler/->load_binary/do_coredump.

    - sys_fork()/sys_vfork()/sys_clone() unified; some architectures
    still need wrappers (ones with callee-saved registers not saved in
    pt_regs on syscall entry), but the main part of those suckers is in
    kernel/fork.c now."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (113 commits)
    do_coredump(): get rid of pt_regs argument
    print_fatal_signal(): get rid of pt_regs argument
    ptrace_signal(): get rid of unused arguments
    get rid of ptrace_signal_deliver() arguments
    new helper: signal_pt_regs()
    unify default ptrace_signal_deliver
    flagday: kill pt_regs argument of do_fork()
    death to idle_regs()
    don't pass regs to copy_process()
    flagday: don't pass regs to copy_thread()
    bfin: switch to generic vfork, get rid of pointless wrappers
    xtensa: switch to generic clone()
    openrisc: switch to use of generic fork and clone
    unicore32: switch to generic clone(2)
    score: switch to generic fork/vfork/clone
    c6x: sanitize copy_thread(), get rid of clone(2) wrapper, switch to generic clone()
    take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h
    mn10300: switch to generic fork/vfork/clone
    h8300: switch to generic fork/vfork/clone
    tile: switch to generic clone()
    ...

    Conflicts:
    arch/microblaze/include/asm/Kbuild

    Linus Torvalds
     
  • The current checksum calculation code does nothing except checking that
    the first byte of nvram is 0 without actually checking the checksum.

    Implement the correct checksum calculation by calculating the crc32 with
    the checksum field set to 0.

    Signed-off-by: Jonas Gorski
    Patchwork: http://patchwork.linux-mips.org/patch/4540

    Jonas Gorski
     
  • Instated of providing an own GPIO driver use the one provided by ssb and
    bcma.

    Signed-off-by: Hauke Mehrtens
    Patchwork: http://patchwork.linux-mips.org/patch/4592
    Acked-by: Florian Fainelli

    Hauke Mehrtens
     

12 Dec, 2012

5 commits