1. 11 3月, 2011 1 次提交
  2. 07 3月, 2011 1 次提交
  3. 02 3月, 2011 1 次提交
    • L
      Revert "TPM: Long default timeout fix" · 8d1dc20e
      Linus Torvalds 提交于
      This reverts commit c4ff4b82.
      
      Ted Ts'o reports:
      
       "TPM is working for me so I can log into employer's network in 2.6.37.
        It broke when I tried 2.6.38-rc6, with the following relevant lines
        from my dmesg:
      
        [   11.081627] tpm_tis 00:0b: 1.2 TPM (device-id 0x0, rev-id 78)
        [   25.734114] tpm_tis 00:0b: Operation Timed out
        [   78.040949] tpm_tis 00:0b: Operation Timed out
      
        This caused me to get suspicious, especially since the _other_ TPM
        commit in 2.6.38 had already been reverted, so I tried reverting
        commit c4ff4b82: "TPM: Long default timeout fix".  With this commit
        reverted, my TPM on my Lenovo T410 is once again working."
      Requested-and-tested-by: NTheodore Ts'o <tytso@mit.edu>
      Acked-by: NRajiv Andrade <srajiv@linux.vnet.ibm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8d1dc20e
  4. 23 2月, 2011 1 次提交
  5. 22 2月, 2011 1 次提交
  6. 21 2月, 2011 2 次提交
    • J
      random: update interface comments to reflect reality · 442a4fff
      Jarod Wilson 提交于
      At present, the comment header in random.c makes no mention of
      add_disk_randomness, and instead, suggests that disk activity adds to the
      random pool by way of add_interrupt_randomness, which appears to not have
      been the case since sometime prior to the existence of git, and even prior
      to bitkeeper. Didn't look any further back. At least, as far as I can
      tell, there are no storage drivers setting IRQF_SAMPLE_RANDOM, which is a
      requirement for add_interrupt_randomness to trigger, so the only way for a
      disk to contribute entropy is by way of add_disk_randomness. Update
      comments accordingly, complete with special mention about solid state
      drives being a crappy source of entropy (see e2e1a148 for reference).
      Signed-off-by: NJarod Wilson <jarod@redhat.com>
      Acked-by: NMatt Mackall <mpm@selenic.com>
      Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
      442a4fff
    • L
      Revert "tpm_tis: Use timeouts returned from TPM" · e5871372
      Linus Torvalds 提交于
      This reverts commit 9b29050f.
      
      It has caused hibernate regressions, for example Juri Sladby's report:
      
        "I'm unable to hibernate 2.6.37.1 unless I rmmod tpm_tis:
         [10974.074587] Suspending console(s) (use no_console_suspend to debug)
         [10974.103073] tpm_tis 00:0c: Operation Timed out
         [10974.103089] legacy_suspend(): pnp_bus_suspend+0x0/0xa0 returns -62
         [10974.103095] PM: Device 00:0c failed to freeze: error -62"
      
      and Rafael points out that some of the new conditionals in that commit
      seem to make no sense.  This commit needs more work and testing, let's
      revert it for now.
      Reported-by: NNorbert Preining <preining@logic.at>
      Reported-and-requested-by: NJiri Slaby <jirislaby@gmail.com>
      Cc: Stefan Berger <stefanb@linux.vnet.ibm.com>
      Cc: Guillaume Chazarain <guichaz@gmail.com>
      Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
      Acked-by: NRafael J. Wysocki <rjw@sisk.pl>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e5871372
  7. 19 2月, 2011 2 次提交
    • A
      cm4000_cs: Fix undefined ops warning · 644e6e4a
      Alan Cox 提交于
      Signed-off-by: NAlan Cox <alan@linux.intel.com>
      Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
      644e6e4a
    • J
      drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to... · d5bb2923
      Julia Lawall 提交于
      drivers/char/pcmcia/ipwireless/main.c: Convert release_resource to release_region/release_mem_region
      
      Request_region should be used with release_region, not release_resource.
      
      This patch contains a number of changes, related to calls to request_region,
      request_mem_region, and the associated error handling code.
      
      1. For the call to request_region, the variable io_resource storing the
      result is dropped.  The call to release_resource at the end of the function
      is changed to a call to release_region with the first two arguments of
      request_region as its arguments.  The same call to release_region is also
      added to release_ipwireless.
      
      2. The first call to request_mem_region is now tested and ret is set to
      -EBUSY if the the call has failed.  This call was associated with the
      initialization of ipw->attr_memory.  But the error handling code was
      testing ipw->common_memory.  The definition of release_ipwireless also
      suggests that this call should be associated with ipw->common_memory, not
      ipw->attr_memory.
      
      3. The second call to request_mem_region is now tested and ret is
      set to -EBUSY if the the call has failed.
      
      4. The various gotos to the error handling code is adjusted so that there
      is no need for ifs.
      
      5. Return the value stored in the ret variable rather than -1.
      
      The semantic match that finds this problem is as follows:
      (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @@
      expression x,E;
      @@
      (
      *x = request_region(...)
      |
      *x = request_mem_region(...)
      )
      ... when != release_region(x)
          when != x = E
      * release_resource(x);
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>
      d5bb2923
  8. 16 2月, 2011 1 次提交
  9. 11 2月, 2011 2 次提交
  10. 04 2月, 2011 4 次提交
  11. 03 2月, 2011 1 次提交
  12. 02 2月, 2011 6 次提交
  13. 26 1月, 2011 1 次提交
    • T
      console: rename acquire/release_console_sem() to console_lock/unlock() · ac751efa
      Torben Hohn 提交于
      The -rt patches change the console_semaphore to console_mutex.  As a
      result, a quite large chunk of the patches changes all
      acquire/release_console_sem() to acquire/release_console_mutex()
      
      This commit makes things use more neutral function names which dont make
      implications about the underlying lock.
      
      The only real change is the return value of console_trylock which is
      inverted from try_acquire_console_sem()
      
      This patch also paves the way to switching console_sem from a semaphore to
      a mutex.
      
      [akpm@linux-foundation.org: coding-style fixes]
      [akpm@linux-foundation.org: make console_trylock return 1 on success, per Geert]
      Signed-off-by: NTorben Hohn <torbenh@gmx.de>
      Cc: Thomas Gleixner <tglx@tglx.de>
      Cc: Greg KH <gregkh@suse.de>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ac751efa
  14. 25 1月, 2011 2 次提交
  15. 24 1月, 2011 2 次提交
  16. 23 1月, 2011 1 次提交
  17. 21 1月, 2011 1 次提交
    • D
      kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT · 6a108a14
      David Rientjes 提交于
      The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option
      is used to configure any non-standard kernel with a much larger scope than
      only small devices.
      
      This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes
      references to the option throughout the kernel.  A new CONFIG_EMBEDDED
      option is added that automatically selects CONFIG_EXPERT when enabled and
      can be used in the future to isolate options that should only be
      considered for embedded systems (RISC architectures, SLOB, etc).
      
      Calling the option "EXPERT" more accurately represents its intention: only
      expert users who understand the impact of the configuration changes they
      are making should enable it.
      Reviewed-by: NIngo Molnar <mingo@elte.hu>
      Acked-by: NDavid Woodhouse <david.woodhouse@intel.com>
      Signed-off-by: NDavid Rientjes <rientjes@google.com>
      Cc: Greg KH <gregkh@suse.de>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Robin Holt <holt@sgi.com>
      Cc: <linux-arch@vger.kernel.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6a108a14
  18. 15 1月, 2011 1 次提交
  19. 14 1月, 2011 5 次提交
    • G
      tty: move drivers/serial/ to drivers/tty/serial/ · ab4382d2
      Greg Kroah-Hartman 提交于
      The serial drivers are really just tty drivers, so move them to
      drivers/tty/ to make things a bit neater overall.
      
      This is part of the tty/serial driver movement proceedure as proposed by
      Arnd Bergmann and approved by everyone involved a number of months ago.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
      Cc: Geert Uytterhoeven <geert@linux-m68k.org>
      Cc: Rogier Wolff <R.E.Wolff@bitwizard.nl>
      Cc: Michael H. Warfield <mhw@wittsend.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      ab4382d2
    • G
      tty: move hvc drivers to drivers/tty/hvc/ · 728674a7
      Greg Kroah-Hartman 提交于
      As requested by Arnd Bergmann, the hvc drivers are now
      moved to the drivers/tty/hvc/ directory.  The virtio_console.c driver
      was also moved, as it required the hvc_console.h file to be able to be
      built, and it really is a hvc driver.
      
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      728674a7
    • A
      ramoops: fix types, remove typecasts · 264b795f
      Andrew Morton 提交于
      Cc: Ahmed S. Darwish <darwish.07@gmail.com>
      Cc: Kyungmin Park <kyungmin.park@samsung.com>
      Cc: Marco Stornelli <marco.stornelli@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      264b795f
    • A
      cs5535: deprecate older cs5535_gpio driver · cf8e9086
      Andres Salomon 提交于
      The newer drivers/gpio/cs5535-gpio.c replaces drivers/misc/cs5535_gpio.c.
      The new driver has been in the tree for a little while, and has received
      some testing; it's time to mark the old one as deprecated.  I'm thinking
      removal around 2.6.40 would be good, provided we're not missing critical
      functionality in the newer driver.
      Signed-off-by: NAndres Salomon <dilinger@queued.net>
      Cc: Daniel Drake <dsd@laptop.org>
      Acked-by: NBen Gardner <bgardner@wabtec.com>
      Cc: Greg KH <greg@kroah.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cf8e9086
    • S
      kmsg_dump: constrain mtdoops and ramoops to perform their actions only for KMSG_DUMP_PANIC · fc2d557c
      Seiji Aguchi 提交于
      This series aims to develop logging facility for enterprise use.
      
      It is important to save kernel messages reliably on enterprise system
      because they are helpful for diagnosing system.
      
      This series add kmsg_dump() to the paths loosing kernel messages.  The use
      case is the following.
      
      [Use case of reboot/poweroff/halt/emergency_restart]
      
       My company has often experienced the followings in our support service.
       - Customer's system suddenly reboots.
       - Customers ask us to investigate the reason of the reboot.
      
      We recognize the fact itself because boot messages remain in
      /var/log/messages.  However, we can't investigate the reason why the
      system rebooted, because the last messages don't remain.  And off course
      we can't explain the reason.
      
      We can solve above problem with this patch as follows.
      
       Case1: reboot with command
         - We can see "Restarting system with command:" or ""Restarting system.".
      
       Case2: halt with command
         - We can see "System halted.".
      
       Case3: poweroff with command
         - We can see " Power down.".
      
       Case4: emergency_restart with sysrq.
         - We can see "Sysrq:" outputted in __handle_sysrq().
      
       Case5: emergency_restart with softdog.
         - We can see "Initiating system reboot" in watchdog_fire().
      
      So, we can distinguish the reason of reboot, poweroff, halt and emergency_restart.
      
      If customer executed reboot command, you may think the customer should
      know the fact.  However, they often claim they don't execute the command
      when they rebooted system by mistake.
      
      No message remains on the current Linux kernel, so we can't show the proof
      to the customer.  This patch improves this situation.
      
      This patch:
      
      Alters mtdoops and ramoops to perform their actions only for
      KMSG_DUMP_PANIC, KMSG_DUMP_OOPS and KMSG_DUMP_KEXEC because they would
      like to log crashes only.
      Signed-off-by: NSeiji Aguchi <seiji.aguchi@hds.com>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Marco Stornelli <marco.stornelli@gmail.com>
      Reviewed-by: NArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      fc2d557c
  20. 12 1月, 2011 4 次提交