1. 22 Aug, 2012 1 commit
  2. 16 Aug, 2012 1 commit
    • Stephen Rothwell's avatar
      HID: picolcd: using vmalloc() requires the include of vmalloc.h · d1c60a03
      Stephen Rothwell authored
      Fixes thes build errors:
      
      drivers/hid/hid-picolcd_fb.c: In function 'picolcd_fb_destroy':
      drivers/hid/hid-picolcd_fb.c:350:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
      drivers/hid/hid-picolcd_fb.c: In function 'picolcd_init_framebuffer':
      drivers/hid/hid-picolcd_fb.c:508:2: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
      drivers/hid/hid-picolcd_fb.c:508:12: warning: assignment makes pointer from integer without a cast [enabled by default]
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      d1c60a03
  3. 15 Aug, 2012 6 commits
    • Bruno Prémont's avatar
      efdbb10e
    • Bruno Prémont's avatar
      HID: picoLCD: Improve unplug handling · a93ab849
      Bruno Prémont authored
      Stop earlier attempting to submit new reports/URBs (though locking and
      usbhid still prevents to bail out early enough to not produce multiple
        hid-picolcd 0003:04D8:C002.0003: usb_submit_urb(out) failed: -19
      messages in kernel log.
      
      Strengthen framebuffer removal to be less racy.
      Signed-off-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      a93ab849
    • Bruno Prémont's avatar
      HID: picoLCD: satify some checkpatch warnings · baacf9c5
      Bruno Prémont authored
      WARNING: static const char * array should probably be static const char * const
      +static const char *error_codes[] = {
      
      WARNING: min() should probably be min_t(size_t, 20, s)
      +       raw_data[2] = min((size_t)20, s);
      
      Note: the second min_t suggestion cannot be followed because GCC is not
      smart enough to track constants through it and make
      copy_from_user_overflow() check happy.
      
      WARNING: min() should probably be min_t(u8, 20, raw_data[2])
      +       if (copy_from_user(raw_data+3, u, min((u8)20, raw_data[2])))
                      return -EFAULT;
      Signed-off-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      baacf9c5
    • Bruno Prémont's avatar
      HID: picoLCD: prevent NULL pointer dereference on unplug · b07072e6
      Bruno Prémont authored
      [  679.807480] BUG: unable to handle kernel NULL pointer dereference at 00000074
      [  679.814457] IP: [<de93b5bf>] picolcd_led_set_brightness+0x1f/0xb0 [hid_picolcd]
      [  679.814457] *pde = 00000000
      [  679.814457] Oops: 0000 [#1]
      [  679.814457] Modules linked in: hid_picolcd fb_sys_fops sysimgblt sysfillrect syscopyarea drm_kms_helper nfs lockd nfs_acl sunrpc [last unloaded: hid_picolcd]
      [  679.814457]
      [  679.814457] Pid: 272, comm: khubd Not tainted 3.5.0-jupiter-00006-g463a4c0 #1 NVIDIA Corporation. nFORCE-MCP/MS-6373
      [  679.814457] EIP: 0060:[<de93b5bf>] EFLAGS: 00010246 CPU: 0
      [  679.814457] EIP is at picolcd_led_set_brightness+0x1f/0xb0 [hid_picolcd]
      [  679.814457] EAX: 00000000 EBX: d9f0c4e0 ECX: 00000000 EDX: 00000000
      [  679.814457] ESI: 00000000 EDI: dd6b79c0 EBP: dd4f7d90 ESP: dd4f7d80
      [  679.814457]  DS: 007b ES: 007b FS: 0000 GS: 00e0 SS: 0068
      [  679.814457] CR0: 8005003b CR2: 00000074 CR3: 1d74e000 CR4: 000007d0
      [  679.814457] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
      [  679.814457] DR6: ffff0ff0 DR7: 00000400
      [  679.814457] Process khubd (pid: 272, ti=dd4f6000 task=dd442470 task.ti=dd4f6000)
      [  679.814457] Stack:
      [  679.814457]  1d6c3300 d9f0c4e0 d9f0c4e0 dd6b79c0 dd4f7da0 c132912a 00000000 d9f0c4e0
      [  679.814457]  dd4f7dac c132935d 00000000 dd4f7dc0 de93b847 dd6b79c0 00000282 c700ecc8
      [  679.814457]  dd4f7ddc de93924f 00000004 c700ecc8 c700e060 c700ecbc c15ee300 dd4f7dec
      [  679.814457] Call Trace:
      [  679.814457]  [<c132912a>] led_brightness_set+0x2a/0x30
      [  679.814457]  [<c132935d>] led_classdev_unregister+0xd/0x50
      [  679.814457]  [<de93b847>] picolcd_exit_leds+0x27/0x40 [hid_picolcd]
      [  679.814457]  [<de93924f>] picolcd_remove+0xbf/0x110 [hid_picolcd]
      [  679.814457]  [<c132c5dd>] hid_device_remove+0x3d/0x80
      [  679.814457]  [<c1294126>] __device_release_driver+0x56/0xa0
      [  679.814457]  [<c1294190>] device_release_driver+0x20/0x30
      [  679.814457]  [<c1293bbf>] bus_remove_device+0x9f/0xc0
      [  679.814457]  [<c1291a1d>] device_del+0xdd/0x150
      [  679.814457]  [<c132c205>] hid_destroy_device+0x25/0x60
      [  679.814457]  [<c13368cb>] usbhid_disconnect+0x1b/0x40
      [  679.814457]  [<c12f4976>] usb_unbind_interface+0x46/0x170
      [  679.814457]  [<c1294126>] __device_release_driver+0x56/0xa0
      [  679.814457]  [<c1294190>] device_release_driver+0x20/0x30
      [  679.814457]  [<c1293bbf>] bus_remove_device+0x9f/0xc0
      [  679.814457]  [<c1291a1d>] device_del+0xdd/0x150
      [  679.814457]  [<c12f2975>] usb_disable_device+0x85/0x1a0
      [  679.814457]  [<c1053146>] ? __cond_resched+0x16/0x30
      [  679.814457]  [<c12ebdb0>] usb_disconnect+0x80/0xf0
      [  679.814457]  [<c12ed61f>] hub_thread+0x3df/0x1030
      [  679.814457]  [<c10484a0>] ? wake_up_bit+0x30/0x30
      [  679.814457]  [<c12ed240>] ? usb_remote_wakeup+0x40/0x40
      [  679.814457]  [<c1047f94>] kthread+0x74/0x80
      [  679.814457]  [<c1047f20>] ? flush_kthread_worker+0x90/0x90
      [  679.814457]  [<c140e33e>] kernel_thread_helper+0x6/0xd
      [  679.814457] Code: e0 25 00 e0 ff ff ff 48 14 eb 99 90 55 89 e5 83 ec 10 89 5d f4 89 75 f8 89 c3 89 7d fc 8b 40 1c 89 d6 8b 00 e8 13 89 95 e2 31 c9 <39> 5c 88 74 74 13 41 83 f9 08 75 f4 8b 5d f4 8b 75 f8 8b 7d fc
      [  679.814457] EIP: [<de93b5bf>] picolcd_led_set_brightness+0x1f/0xb0 [hid_picolcd] SS:ESP 0068:dd4f7d80
      [  679.814457] CR2: 0000000000000074
      [  680.116438] ---[ end trace 6f0d9d63bff280ff ]---
      Signed-off-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      b07072e6
    • Bruno Prémont's avatar
    • Bruno Prémont's avatar
      HID: picoLCD: split driver code · fabdbf2f
      Bruno Prémont authored
      In order to make code maintenance easier, split the vairous
      functions into individial files (this removes a bunch of #ifdefs).
      Signed-off-by: default avatarBruno Prémont <bonbons@linux-vserver.org>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      fabdbf2f
  4. 24 Jul, 2012 32 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · e8ff13b0
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "The list of changes worth pointing out explicitly:
      
        - We are getting 'UHID', which is a new framework for implementing HID
          transport drivers in userspace (this is different from HIDRAW, which
          is transport-independent and provides report parsing facilities;
          uhid is for the other (transport) part of the pipeline).
      
          It's needed for (and currently being used by) Bluetooth-LowEnergy,
          as its specification mandates things we don't want in the kernel.
      
          Written by David Herrmann.
      
        - there have been quite a few bugs in runtime suspend/resume paths
          (probably never reported to actually happen in the wild, but still).
          Alan Stern fixed those.
      
        - a few other driver updates and fixes and random new device support."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (45 commits)
        HID: add ASUS AIO keyboard model AK1D
        HID: add support for Cypress barcode scanner 04B4:ED81
        HID: Allow drivers to be their own listener
        HID: usbhid: fix error paths in suspend
        HID: usbhid: check for suspend or reset before restarting
        HID: usbhid: replace HID_REPORTED_IDLE with HID_SUSPENDED
        HID: usbhid: inline some simple routines
        HID: usbhid: fix autosuspend calls
        HID: usbhid: fix use-after-free bug
        HID: hid-core: optimize in case of hidraw
        HID: hidraw: fix list->buffer memleak
        HID: uhid: Fix sending events with invalid data
        HID: roccat: added sensor sysfs attribute for Savu
        HID: Add driver for Holtek based keyboards with broken HID
        HID: Add suport for the brightness control keys on HP keyboards
        HID: magicmouse: Implement Multi-touch Protocol B (MT-B)
        HID: magicmouse: Removing report_touches switch
        HID: roccat: rename roccat_common functions to roccat_common2
        HID: roccat: fix wrong hid_err usage on struct usb_device
        HID: roccat: move functionality to roccat-common
        ...
      e8ff13b0
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 0cd5ff59
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "New drivers for DA9052/53 PMIC as well as HIH-6130/HIH-6131 humidity
        and temperature sensors.
      
        Convert drivers to use devm_ functions and to use dev_pm_ops.  Address
        a couple of Coverity errors/warnings as well as compile warnings.
        Some functional improvements in applesmc driver."
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (72 commits)
        hwmon: (applesmc) Ignore some temperature registers
        hwmon: (applesmc) Allow negative temperature values
        hwmon: (s3c-hwmon) Use devm_kzalloc instead of kzalloc
        hwmon: (w83781d) Fix compile warning
        hwmon: (applesmc) Shorten minimum wait time
        hwmon: (exynos4_tmu) Use struct dev_pm_ops for power management
        hwmon: (gpio-fan) Use struct dev_pm_ops for power management
        hwmon: (abituguru3) Use struct dev_pm_ops for power management
        hwmon: (abituguru) Use struct dev_pm_ops for power management
        hwmon: (acpi_power_meter) Fix unintentional integer overflow
        hwmon: (acpi_power_meter) Cleanup and optimizations
        hwmon: Honeywell Humidicon HIH-6130/HIH-6131 humidity and temperature sensor driver
        hwmon: (applesmc) Skip sensor mapping
        hwmon: (ntc_thermistor) Ensure that data->name string is terminated
        hwmon: (w83l785ts) Convert to use devm_ functions
        hwmon: (w83l785ts) Simplify code and improve readability
        hwmon: (smsc47m192) Convert to use devm_ functions
        hwmon: (smsc47m1) Convert to use devm_ functions
        hwmon: (smsc47b397) Convert to use devm_ functions
        hwmon: (k8temp) Convert to use devm_ functions
        ...
      0cd5ff59
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 3539fc54
      Linus Torvalds authored
      Pull watchdog changes from Wim Van Sebroeck:
       - conversion of iTCO_wdt and orion_wdt to the generic watchdog API
       - uses module_platform_driver() for s3c2410_wdt
       - Adds support for Jetway JNF99 Motherboard
       - various fixes
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: orion_wdt: Convert driver to watchdog core
        watchdog: s3c2410_wdt: Use module_platform_driver()
        watchdog: sch311x_wdt: Fix Polarity when starting watchdog
        Watchdog: OMAP: Fix the runtime pm code to avoid module getting stuck intransition state.
        watchdog: ie6xx_wdt: section mismatch in ie6xx_wdt_probe()
        watchdog: bcm63xx_wdt: fix driver section mismatch
        watchdog: iTCO_wdt.c: convert to watchdog core
        char/ipmi: remove local ioctl defines replaced by generic ones
        watchdog: xilinx: Read clock frequency directly from DT node
        watchdog: coh901327_wdt: use clk_prepare/unprepare
        watchdog: f71808e_wdt: Add support for Jetway JNF99 motherboard
      3539fc54
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm · 2b849570
      Linus Torvalds authored
      Pull frontswap updates from Konrad Rzeszutek Wilk:
       "Cleanups in code and documentation.  Little bit of refactoring for
        cleaner look."
      
      * tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
        mm/frontswap: cleanup doc and comment error
        mm: frontswap: remove unneeded headers
        mm: frontswap: split out function to clear a page out
        mm: frontswap: remove unnecessary check during initialization
        mm: frontswap: make all branches of if statement in put page consistent
        mm: frontswap: split frontswap_shrink further to simplify locking
        mm: frontswap: split out __frontswap_unuse_pages
        mm: frontswap: split out __frontswap_curr_pages
        mm: frontswap: trivial coding convention issues
        mm: frontswap: remove casting from function calls through ops structure
      2b849570
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.6-rc0-tag' of... · 62c4d9af
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen update from Konrad Rzeszutek Wilk:
       "Features:
         * Performance improvement to lower the amount of traps the hypervisor
           has to do 32-bit guests.  Mainly for setting PTE entries and
           updating TLS descriptors.
         * MCE polling driver to collect hypervisor MCE buffer and present
           them to /dev/mcelog.
         * Physical CPU online/offline support.  When an privileged guest is
           booted it is present with virtual CPUs, which might have an 1:1 to
           physical CPUs but usually don't.  This provides mechanism to
           offline/online physical CPUs.
        Bug-fixes for:
         * Coverity found fixes in the console and ACPI processor driver.
         * PVonHVM kexec fixes along with some cleanups.
         * Pages that fall within E820 gaps and non-RAM regions (and had been
           released to hypervisor) would be populated back, but potentially in
           non-RAM regions."
      
      * tag 'stable/for-linus-3.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: populate correct number of pages when across mem boundary (v2)
        xen PVonHVM: move shared_info to MMIO before kexec
        xen: simplify init_hvm_pv_info
        xen: remove cast from HYPERVISOR_shared_info assignment
        xen: enable platform-pci only in a Xen guest
        xen/pv-on-hvm kexec: shutdown watches from old kernel
        xen/x86: avoid updating TLS descriptors if they haven't changed
        xen/x86: add desc_equal() to compare GDT descriptors
        xen/mm: zero PTEs for non-present MFNs in the initial page table
        xen/mm: do direct hypercall in xen_set_pte() if batching is unavailable
        xen/hvc: Fix up checks when the info is allocated.
        xen/acpi: Fix potential memory leak.
        xen/mce: add .poll method for mcelog device driver
        xen/mce: schedule a workqueue to avoid sleep in atomic context
        xen/pcpu: Xen physical cpus online/offline sys interface
        xen/mce: Register native mce handler as vMCE bounce back point
        x86, MCE, AMD: Adjust initcall sequence for xen
        xen/mce: Add mcelog support for Xen platform
      62c4d9af
    • Linus Torvalds's avatar
      Merge tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 5fecc9d8
      Linus Torvalds authored
      Pull KVM updates from Avi Kivity:
       "Highlights include
        - full big real mode emulation on pre-Westmere Intel hosts (can be
          disabled with emulate_invalid_guest_state=0)
        - relatively small ppc and s390 updates
        - PCID/INVPCID support in guests
        - EOI avoidance; 3.6 guests should perform better on 3.6 hosts on
          interrupt intensive workloads)
        - Lockless write faults during live migration
        - EPT accessed/dirty bits support for new Intel processors"
      
      Fix up conflicts in:
       - Documentation/virtual/kvm/api.txt:
      
         Stupid subchapter numbering, added next to each other.
      
       - arch/powerpc/kvm/booke_interrupts.S:
      
         PPC asm changes clashing with the KVM fixes
      
       - arch/s390/include/asm/sigp.h, arch/s390/kvm/sigp.c:
      
         Duplicated commits through the kvm tree and the s390 tree, with
         subsequent edits in the KVM tree.
      
      * tag 'kvm-3.6-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (93 commits)
        KVM: fix race with level interrupts
        x86, hyper: fix build with !CONFIG_KVM_GUEST
        Revert "apic: fix kvm build on UP without IOAPIC"
        KVM guest: switch to apic_set_eoi_write, apic_write
        apic: add apic_set_eoi_write for PV use
        KVM: VMX: Implement PCID/INVPCID for guests with EPT
        KVM: Add x86_hyper_kvm to complete detect_hypervisor_platform check
        KVM: PPC: Critical interrupt emulation support
        KVM: PPC: e500mc: Fix tlbilx emulation for 64-bit guests
        KVM: PPC64: booke: Set interrupt computation mode for 64-bit host
        KVM: PPC: bookehv: Add ESR flag to Data Storage Interrupt
        KVM: PPC: bookehv64: Add support for std/ld emulation.
        booke: Added crit/mc exception handler for e500v2
        booke/bookehv: Add host crit-watchdog exception support
        KVM: MMU: document mmu-lock and fast page fault
        KVM: MMU: fix kvm_mmu_pagetable_walk tracepoint
        KVM: MMU: trace fast page fault
        KVM: MMU: fast path of handling guest page fault
        KVM: MMU: introduce SPTE_MMU_WRITEABLE bit
        KVM: MMU: fold tlb flush judgement into mmu_spte_update
        ...
      5fecc9d8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 3c4cfade
      Linus Torvalds authored
      Pull networking changes from David S Miller:
      
       1) Remove the ipv4 routing cache.  Now lookups go directly into the FIB
          trie and use prebuilt routes cached there.
      
          No more garbage collection, no more rDOS attacks on the routing
          cache.  Instead we now get predictable and consistent performance,
          no matter what the pattern of traffic we service.
      
          This has been almost 2 years in the making.  Special thanks to
          Julian Anastasov, Eric Dumazet, Steffen Klassert, and others who
          have helped along the way.
      
          I'm sure that with a change of this magnitude there will be some
          kind of fallout, but such things ought the be simple to fix at this
          point.  Luckily I'm not European so I'll be around all of August to
          fix things :-)
      
          The major stages of this work here are each fronted by a forced
          merge commit whose commit message contains a top-level description
          of the motivations and implementation issues.
      
       2) Pre-demux of established ipv4 TCP sockets, saves a route demux on
          input.
      
       3) TCP SYN/ACK performance tweaks from Eric Dumazet.
      
       4) Add namespace support for netfilter L4 conntrack helpers, from Gao
          Feng.
      
       5) Add config mechanism for Energy Efficient Ethernet to ethtool, from
          Yuval Mintz.
      
       6) Remove quadratic behavior from /proc/net/unix, from Eric Dumazet.
      
       7) Support for connection tracker helpers in userspace, from Pablo
          Neira Ayuso.
      
       8) Allow userspace driven TX load balancing functions in TEAM driver,
          from Jiri Pirko.
      
       9) Kill off NLMSG_PUT and RTA_PUT macros, more gross stuff with
          embedded gotos.
      
      10) TCP Small Queues, essentially minimize the amount of TCP data queued
          up in the packet scheduler layer.  Whereas the existing BQL (Byte
          Queue Limits) limits the pkt_sched --> netdevice queuing levels,
          this controls the TCP --> pkt_sched queueing levels.
      
          From Eric Dumazet.
      
      11) Reduce the number of get_page/put_page ops done on SKB fragments,
          from Alexander Duyck.
      
      12) Implement protection against blind resets in TCP (RFC 5961), from
          Eric Dumazet.
      
      13) Support the client side of TCP Fast Open, basically the ability to
          send data in the SYN exchange, from Yuchung Cheng.
      
          Basically, the sender queues up data with a sendmsg() call using
          MSG_FASTOPEN, then they do the connect() which emits the queued up
          fastopen data.
      
      14) Avoid all the problems we get into in TCP when timers or PMTU events
          hit a locked socket.  The TCP Small Queues changes added a
          tcp_release_cb() that allows us to queue work up to the
          release_sock() caller, and that's what we use here too.  From Eric
          Dumazet.
      
      15) Zero copy on TX support for TUN driver, from Michael S. Tsirkin.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1870 commits)
        genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
        r8169: revert "add byte queue limit support".
        ipv4: Change rt->rt_iif encoding.
        net: Make skb->skb_iif always track skb->dev
        ipv4: Prepare for change of rt->rt_iif encoding.
        ipv4: Remove all RTCF_DIRECTSRC handliing.
        ipv4: Really ignore ICMP address requests/replies.
        decnet: Don't set RTCF_DIRECTSRC.
        net/ipv4/ip_vti.c: Fix __rcu warnings detected by sparse.
        ipv4: Remove redundant assignment
        rds: set correct msg_namelen
        openvswitch: potential NULL deref in sample()
        tcp: dont drop MTU reduction indications
        bnx2x: Add new 57840 device IDs
        tcp: avoid oops in tcp_metrics and reset tcpm_stamp
        niu: Change niu_rbr_fill() to use unlikely() to check niu_rbr_add_page() return value
        niu: Fix to check for dma mapping errors.
        net: Fix references to out-of-scope variables in put_cmsg_compat()
        net: ethernet: davinci_emac: add pm_runtime support
        net: ethernet: davinci_emac: Remove unnecessary #include
        ...
      3c4cfade
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e017507f
      Linus Torvalds authored
      Pull s390 changes from Martin Schwidefsky:
       "No new functions, a few changes to make the code more robust, some
        cleanups and bug fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (21 commits)
        s390/vtimer: rework virtual timer interface
        s390/dis: Add the servc instruction to the disassembler.
        s390/comments: unify copyright messages and remove file names
        s390/lgr: Add init check to lgr_info_log()
        s390/cpu init: use __get_cpu_var instead of per_cpu
        s390/idle: reduce size of s390_idle_data structure
        s390/idle: fix sequence handling vs cpu hotplug
        s390/ap: resend enable adapter interrupt request.
        s390/hypfs: Add missing get_next_ino()
        s390/dasd: add shutdown action
        s390/ipl: Fix ipib handling for "dumpreipl" shutdown action
        s390/smp: make absolute lowcore / cpu restart parameter accesses more robust
        s390/vmlogrdr: cleanup driver attribute usage
        s390/vmlogrdr: cleanup device attribute usage
        s390/ccwgroup: remove unused ccwgroup_device member
        s390/cio/chp: cleanup attribute usage
        s390/sigp: use sigp order code defines in assembly code
        s390/smp: use sigp cpu status definitions
        s390/smp/kvm: unifiy sigp definitions
        s390/smp: remove redundant check
        ...
      e017507f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin · 759e2a25
      Linus Torvalds authored
      Pull blackfin changes from Bob Liu:
       "The big changes are adding PM and HDMI support for bf60x, other
        patches are various bug fix and code cleanup."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (48 commits)
        bf60x: fix build warning
        PM: add BF60x flash suspend and resume support
        blackfin: twi: read twi mmr via bfin_read macro
        dpm: deepsleep: reserve stack
        bf60x: cpufreq: fix anomaly 05000273
        bf609: add adv7511 display support
        blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit
        bf60x: Add double fault, hardware error and NMI SEC handler
        bf60x: update anomaly id in serial and twi driver headers.
        bf60x: vs6624 pin update
        bf60x: add default anomaly setting.
        bf60x: update bf60x anomaly list.
        bf60x: sec: Enable sec interrupt source priority configuration.
        bf60x: sec: Clean up interrupt initialization code for SEC.
        bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver
        bf561: add capabilities in adv7183_inputs
        bf609: convert vs6624 blank_clocks to black_pixels
        blackfin: fix musb macro name
        cleanup: sec and linkport only built on bf60x
        bfin: pint: add pint suspend and resume
        ...
      759e2a25
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · 90e66dd9
      Linus Torvalds authored
      Pull C6X changes from Mark Salter:
      
        - remove use of legacy irqs which really wasn't needed
        - add support for C66x SoC on EVMC6678 board
        - clean up compiler warning
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        C6X: clean up compiler warning
        C6X: add basic support for TMS320C6678 SoC
        C6X: remove dependence on legacy IRQs
        C6X: remove megamod-pic requirement on direct-mapped core pic
      90e66dd9
    • Jiri Kosina's avatar
      Merge branch 'uhid' into for-linus · c062c4d1
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/Kconfig
      c062c4d1
    • Jiri Kosina's avatar
      Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes'... · 929bd380
      Jiri Kosina authored
      Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes' and 'upstream' into for-linus
      929bd380
    • WANG Cong's avatar
      genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP · 320f5ea0
      WANG Cong authored
      lockdep_is_held() is defined when CONFIG_LOCKDEP, not CONFIG_PROVE_LOCKING.
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Jesse Gross <jesse@nicira.com>
      Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      320f5ea0
    • Bob Liu's avatar
      bf60x: fix build warning · 719154c6
      Bob Liu authored
      Fix several build warning while using bf609-ezkit_defconfig.
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      719154c6
    • Steven Miao's avatar
      PM: add BF60x flash suspend and resume support · 0220874a
      Steven Miao authored
      Signed-off-by: default avatarSteven Miao <realmz6@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      0220874a
    • Sonic Zhang's avatar
      433b5887
    • Steven Miao's avatar
      dpm: deepsleep: reserve stack · 68bcdd48
      Steven Miao authored
      Reserve 12 bytes on the stack for deepsleep use.
      Signed-off-by: default avatarSteven Miao <realmz6@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      68bcdd48
    • Sonic Zhang's avatar
      bf60x: cpufreq: fix anomaly 05000273 · 7c7d0277
      Sonic Zhang authored
      Anomaly 05000273 doesn't apply to bf60x.
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      7c7d0277
    • Scott Jiang's avatar
      bf609: add adv7511 display support · e942d619
      Scott Jiang authored
      Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      e942d619
    • Bob Liu's avatar
      blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit · acb3166d
      Bob Liu authored
      In user xip test, there is a cplb error when ROMKERNEL try to mount romfs
      using 'mount -t romfs /dev/mtdblock2 /mnt', becasue the CPLB setting is not
      correct.
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      acb3166d
    • Sonic Zhang's avatar
    • Sonic Zhang's avatar
      2a26a205
    • Vivi Li's avatar
      bf60x: vs6624 pin update · 00afdbbf
      Vivi Li authored
      Change ce pin to PE4 according to new adaptor board and re-define ppi for vs6624
      to avoid gpio conflict.
      Signed-off-by: default avatarVivi Li <vivi.li@analog.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      00afdbbf
    • Sonic Zhang's avatar
      bf60x: add default anomaly setting. · 507e20b3
      Sonic Zhang authored
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      507e20b3
    • Sonic Zhang's avatar
      bf60x: update bf60x anomaly list. · 14c04e57
      Sonic Zhang authored
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      14c04e57
    • Sonic Zhang's avatar
      bf60x: sec: Enable sec interrupt source priority configuration. · e0a59310
      Sonic Zhang authored
      Customize the SEC interrupt priority array in machine ints-priority.c.
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      e0a59310
    • Sonic Zhang's avatar
      bf60x: sec: Clean up interrupt initialization code for SEC. · 11b27cb5
      Sonic Zhang authored
      Turn SEC related macro CONFIG_BF60x into SEC_GCTL.
      Move machine specific GPIO_PINT macros to machine gpio header.
      Split SEC init_arch_irq() and vec_to_irq() from old SIC.
      Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      11b27cb5
    • Scott Jiang's avatar
      bf609: reuse bf5xx-i2s-pcm.c as i2s pcm driver · 2984b52b
      Scott Jiang authored
      It's the same for both bf5xx and bf6xx soc.
      Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      2984b52b
    • Scott Jiang's avatar
      bf561: add capabilities in adv7183_inputs · c38670bc
      Scott Jiang authored
      Add capabilities in adv7183_inputs to indicate that S_STD is supported.
      Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      c38670bc
    • Scott Jiang's avatar
      bf609: convert vs6624 blank_clocks to black_pixels · ac5bb893
      Scott Jiang authored
      PPI driver has changed blank units from clocks to pixels.
      Signed-off-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      ac5bb893
    • Bob Liu's avatar
      blackfin: fix musb macro name · b091694b
      Bob Liu authored
      Musb can't work since the marco name has been changed.
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      b091694b
    • Steven Miao's avatar
      cleanup: sec and linkport only built on bf60x · 3375a43f
      Steven Miao authored
      Signed-off-by: default avatarSteven Miao <realmz6@gmail.com>
      Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
      3375a43f