1. 15 12月, 2010 1 次提交
    • D
      Input: define separate EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 · ab4e0192
      Dmitry Torokhov 提交于
      The desire to keep old names for the EVIOCGKEYCODE/EVIOCSKEYCODE while
      extending them to support large scancodes was a mistake. While we tried
      to keep ABI intact (and we succeeded in doing that, programs compiled
      on older kernels will work on newer ones) there is still a problem with
      recompiling existing software with newer kernel headers.
      
      New kernel headers will supply updated ioctl numbers and kernel will
      expect that userspace will use struct input_keymap_entry to set and
      retrieve keymap data. But since the names of ioctls are still the same
      userspace will happily compile even if not adjusted to make use of the
      new structure and will start miraculously fail in the field.
      
      To avoid this issue let's revert EVIOCGKEYCODE/EVIOCSKEYCODE definitions
      and add EVIOCGKEYCODE_V2/EVIOCSKEYCODE_V2 so that userspace can explicitly
      select the style of ioctls it wants to employ.
      Reviewed-by: NHenrik Rydberg <rydberg@euromail.se>
      Acked-by: NJarod Wilson <jarod@redhat.com>
      Acked-by: NMauro Carvalho Chehab <mchehab@redhat.com>
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      ab4e0192
  2. 11 12月, 2010 1 次提交
  3. 08 12月, 2010 1 次提交
  4. 07 12月, 2010 1 次提交
  5. 02 12月, 2010 1 次提交
  6. 01 12月, 2010 4 次提交
  7. 23 11月, 2010 1 次提交
  8. 19 11月, 2010 1 次提交
  9. 16 11月, 2010 1 次提交
  10. 15 11月, 2010 1 次提交
  11. 11 11月, 2010 3 次提交
  12. 05 11月, 2010 1 次提交
    • B
      Input: atkbd - add 'terminal' parameter for IBM Terminal keyboards · 8c5188b6
      Benjamin LaHaise 提交于
      Many of the IBM Terminal keyboards from the 1980s and early 1990s communicate
      using a protocol similar, but not identical to the AT keyboard protocol.
      (Models known to be like this include 6110344, 6110668, 1390876, 1386887, and
      possibly others.)
      
      When the connector is rewired or adapter to an AT-DIN or PS/2 connector, they
      can be connected to a standard PC, with three caveats:
      
      a) They can only use scancode set 3; requests to use anything else are
      quietly ignored.
      b) The AT Command to request Make, Break and Repeat codes is not properly
      interpreted.
      c) The top function keys on a 122 key keyboard, and the arrow/edit keys in
      the middle of the board send non-standard scancodes.
      
      C) is easily taken care of in userspace, by use of setkeycodes
      B) can be taken care of by a userspace hack (that makes the kernel complain
      in dmesg)
      A) is fixable in theory, but on the keyboard i tested on (6110668), it seems
      to be detected unoverridably as Set 2, causing userspace oddities that make
      it harder to fix C).
      
      Enclosed is a small patch to the kernel that fixes A) and B) in the kernel,
      making it much easier to fix C) in userspace. It adds a single kernel
      command line parameter that overrides the detection that sets these boards
      as set 2, and instead of sending the Make-break-repeat command to the
      keyboard, it sends the make-break command, which is properly recognized by
      these keyboards. Software level key repeating seems to make up for the lack
      of hardware repeat codes perfectly.
      
      Without manually setting the command line parameter (tentatively named
      atkbd.terminal), this code has no effect, and the driver works exactly as
      before.
      
      See also:
      
      http://www.seasip.info/VintagePC/ibm_1390876.html
      http://www.seasip.info/VintagePC/ibm_6110344.html
      http://geekhack.org/showwiki.php?title=Island:7306Signed-off-by: NErika Quinn <erikas.aubade@gmail.com>
      Signed-off-by: NBenjamin LaHaise <bcrl@kvack.org>
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      8c5188b6
  13. 04 11月, 2010 4 次提交
  14. 01 11月, 2010 14 次提交
  15. 31 10月, 2010 5 次提交
    • J
      d745b532
    • C
      locks: remove fl_copy_lock lock_manager operation · bb8430a2
      Christoph Hellwig 提交于
      This one was only used for a nasty hack in nfsd, which has recently
      been removed.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bb8430a2
    • C
      locks: let the caller free file_lock on ->setlease failure · 51ee4b84
      Christoph Hellwig 提交于
      The caller allocated it, the caller should free it.
      
      The only issue so far is that we could change the flp pointer even on an
      error return if the fl_change callback failed.  But we can simply move
      the flp assignment after the fl_change invocation, as the callers don't
      care about the flp return value if the setlease call failed.
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      51ee4b84
    • G
      initramfs: Fix initramfs size for 32-bit arches · 96f93593
      Geert Uytterhoeven 提交于
      Commit ffe8018c ("initramfs: fix initramfs size calculation") broke
      32-bit big-endian arches like (on ARAnyM):
      
          VFS: Cannot open root device "hda1" or unknown-block(3,1)
          Please append a correct "root=" boot option; here are the available partitions:
          fe80         1059408 nfhd8  (driver?)
            fe81          921600 nfhd8p1 00000000-0000-0000-0000-000000000nfhd8p1
            fe82          137807 nfhd8p2 00000000-0000-0000-0000-000000000nfhd8p2
          0200            3280 fd0  (driver?)
          0201            3280 fd1  (driver?)
          0300         1059408 hda  driver: ide-gd
            0301          921600 hda1 00000000-0000-0000-0000-000000000hda1
            0302          137807 hda2 00000000-0000-0000-0000-000000000hda2
          Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(3,1)
      
      As pointed out by Kerstin Jonsson <kerstin.jonsson@ericsson.com>, this
      is due to CONFIG_32BIT not being defined, so the initramfs size field is
      done as a 64-bit quad.  On little-endian (like x86) this doesn matter,
      but on a big-endian machine the 32-bit reads will see the (zero) high
      bits.
      
      Only mips, s390, and score set CONFIG_32BIT for 32-bit builds, so fix it for
      all other 32-bit arches by inverting the logic and testing for CONFIG_64BIT,
      which should be defined on all 64-bit arches.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      [ I think we should just make it "u64" on all architectures and get
        rid of the whole #ifdef CONFIG_xxBIT   - Linus ]
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      96f93593
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 3985c7ce
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
        isdn: mISDN: socket: fix information leak to userland
        netdev: can: Change mail address of Hans J. Koch
        pcnet_cs: add new_id
        net: Truncate recvfrom and sendto length to INT_MAX.
        RDS: Let rds_message_alloc_sgs() return NULL
        RDS: Copy rds_iovecs into kernel memory instead of rereading from userspace
        RDS: Clean up error handling in rds_cmsg_rdma_args
        RDS: Return -EINVAL if rds_rdma_pages returns an error
        net: fix rds_iovec page count overflow
        can: pch_can: fix section mismatch warning by using a whitelisted name
        can: pch_can: fix sparse warning
        netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probe
        ip_gre: fix fallback tunnel setup
        vmxnet: trivial annotation of protocol constant
        vmxnet3: remove unnecessary byteswapping in BAR writing macros
        ipv6/udp: report SndbufErrors and RcvbufErrors
        phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
      3985c7ce