07 Aug, 2011
13 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
net: Compute protocol sequence numbers and fragment IDs using MD5.
crypto: Move md5_transform to lib/md5.c -
Computers have become a lot faster since we compromised on the
partial MD4 hash which we use currently for performance reasons.MD5 is a much safer choice, and is inline with both RFC1948 and
other ISS generators (OpenBSD, Solaris, etc.)Furthermore, only having 24-bits of the sequence number be truly
unpredictable is a very serious limitation. So the periodic
regeneration and 8-bit counter have been removed. We compute and
use a full 32-bit sequence number.For ipv6, DCCP was found to use a 32-bit truncated initial sequence
number (it needs 43-bits) and that is fixed here as well.Reported-by: Dan Kaminsky
Tested-by: Willy Tarreau
Signed-off-by: David S. Miller -
We are going to use this for TCP/IP sequence number and fragment ID
generation.Signed-off-by: David S. Miller
-
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: cope with negative dentries in cifs_get_root
cifs: convert prefixpath delimiters in cifs_build_path_to_root
CIFS: Fix missing a decrement of inFlight value
cifs: demote DFS referral lookup errors to cFYI
Revert "cifs: advertise the right receive buffer size to the server" -
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / Runtime: Allow _put_sync() from interrupts-disabled context
PM / Domains: Fix pm_genpd_poweron() -
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (38 commits)
acer-wmi: support Lenovo ideapad S205 wifi switch
acerhdf.c: spaces in aliased changed to *
platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path
x86 driver: fix typo in TDP override enabling
Platform: fix samsung-laptop DMI identification for N150/N210/220/N230
dell-wmi: Add keys for Dell XPS L502X
platform-drivers-x86: samsung-q10: make dmi_check_callback return 1
Platform: Samsung Q10 backlight driver
platform-drivers-x86: intel_scu_ipc: convert to DEFINE_PCI_DEVICE_TABLE
platform-drivers-x86: intel_rar_register: convert to DEFINE_PCI_DEVICE_TABLE
platform-drivers-x86: intel_menlow: add missing return AE_OK for intel_menlow_register_sensor()
platform-drivers-x86: intel_mid_thermal: fix memory leak
platform-drivers-x86: msi-wmi: add missing sparse_keymap_free in msi_wmi_init error path
Samsung Laptop platform driver: support N510
asus-wmi: add uwb rfkill support
asus-wmi: add gps rfkill support
asus-wmi: add CWAP support and clarify the meaning of WAPF bits
asus-wmi: return proper value in store_cpufv()
asus-wmi: check for temp1 presence
asus-wmi: add thermal sensor
... -
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/trace: Fix compile error when CONFIG_XEN_PRIVILEGED_GUEST is not set
xen: Fix misleading WARN message at xen_release_chunk
xen: Fix printk() format in xen/setup.c
xen/tracing: it looks like we wanted CONFIG_FTRACE
xen/self-balloon: Add dependency on tmem.
xen/balloon: Fix compile errors - missing header files.
xen/grant: Fix compile warning.
xen/pciback: remove duplicated #include -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
Battery: sysfs_remove_battery(): possible circular locking -
Two additional savage4 variants were added, but the S3_SAVAGE4_SERIES
macro was incompletely modified, resulting in a false positive detection
of a savage4 card regardless of which savage card is actually present.For non-savage4 series cards, such as a Savage/IX-MV card, this results
in garbled video and/or a hard-hang at boot time. Fix this by changing
an '||' to an '&&' in the S3_SAVAGE4_SERIES macro.Signed-off-by: John P. Stanley
Reviewed-by: Tormod Volden
[ The macros have incomplete parenthesis too, but whatever .. -Linus ]
Signed-off-by: Linus Torvalds -
Patch reviewers now recommend not splitting long user-visible strings,
such as printk messages, even if they exceed 80 columns. This avoids
breaking grep. However, that recommendation did not actually appear
anywhere in Documentation/CodingStyle.See, for example, the thread at
http://news.gmane.org/find-root.php?message_id=%3c1312215262.11635.15.camel%40Joe%2dLaptop%3eSigned-off-by: Josh Triplett
Signed-off-by: Linus Torvalds -
The CLOEXE bit is magical, and for performance (and semantic) reasons we
don't actually maintain it in the file descriptor itself, but in a
separate bit array. Which means that when we show f_flags, the CLOEXE
status is shown incorrectly: we show the status not as it is now, but as
it was when the file was opened.Fix that by looking up the bit properly in the 'fdt->close_on_exec' bit
array.Uli needs this in order to re-implement the pfiles program:
"For normal file descriptors (not sockets) this was the last piece of
information which wasn't available. This is all part of my 'give
Solaris users no reason to not switch' effort. I intend to offer the
code to the util-linux-ng maintainers."Requested-by: Ulrich Drepper
Signed-off-by: Linus Torvalds -
WARN_ONCE() is very annoying, in that it shows the stack trace that we
don't care about at all, and also triggers various user-level "kernel
oopsed" logic that we really don't care about. And it's not like the
user can do anything about the applications (sshd) in question, it's a
distro issue.Requested-by: Andi Kleen (and many others)
Signed-off-by: Linus Torvalds -
For ChromiumOS, we use SHA-1 to verify the integrity of the root
filesystem. The speed of the kernel sha-1 implementation has a major
impact on our boot performance.To improve boot performance, we investigated using the heavily optimized
sha-1 implementation used in git. With the git sha-1 implementation, we
see a 11.7% improvement in boot time.10 reboots, remove slowest/fastest.
Before:
Mean: 6.58 seconds Stdev: 0.14
After (with git sha-1, this patch):
Mean: 5.89 seconds Stdev: 0.07
The other cool thing about the git SHA-1 implementation is that it only
needs 64 bytes of stack for the workspace while the original kernel
implementation needed 320 bytes.Signed-off-by: Mandeep Singh Baines
Cc: Ramsay Jones
Cc: Nicolas Pitre
Cc: Herbert Xu
Cc: David S. Miller
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Linus Torvalds
06 Aug, 2011
27 commits
-
Commit 9c921c22a7f33397a6774d7fa076db9b6a0fd669
Author: Lan TianyuACPI / Battery: Resolve the race condition in the sysfs_remove_battery()
fixed BUG https://bugzilla.kernel.org/show_bug.cgi?id=35642 , but as a side
effect made lockdep unhappy with sysfs_remove_battery():[14818.477168]
[14818.477170] =======================================================
[14818.477200] [ INFO: possible circular locking dependency detected ]
[14818.477221] 3.1.0-dbg-07865-g1280ea8-dirty #668
[14818.477236] -------------------------------------------------------
[14818.477257] s2ram/1599 is trying to acquire lock:
[14818.477276] (s_active#8){++++.+}, at: [] sysfs_addrm_finish+0x31/0x5a
[14818.477323]
[14818.477325] but task is already holding lock:
[14818.477350] (&battery->lock){+.+.+.}, at: [] sysfs_remove_battery+0x10/0x4b [battery]
[14818.477395]
[14818.477397] which lock already depends on the new lock.
[14818.477399]
[..]
[14818.479121] stack backtrace:
[14818.479148] Pid: 1599, comm: s2ram Not tainted 3.1.0-dbg-07865-g1280ea8-dirty #668
[14818.479175] Call Trace:
[14818.479198] [] print_circular_bug+0x293/0x2a4
[14818.479228] [] __lock_acquire+0xfe4/0x164b
[14818.479260] [] ? sysfs_addrm_finish+0x31/0x5a
[14818.479288] [] lock_acquire+0x138/0x1ac
[14818.479316] [] ? sysfs_addrm_finish+0x31/0x5a
[14818.479345] [] sysfs_deactivate+0x9b/0xec
[14818.479373] [] ? sysfs_addrm_finish+0x31/0x5a
[14818.479405] [] sysfs_addrm_finish+0x31/0x5a
[14818.479433] [] sysfs_hash_and_remove+0x54/0x77
[14818.479461] [] sysfs_remove_file+0x12/0x14
[14818.479488] [] device_remove_file+0x12/0x14
[14818.479516] [] device_del+0x119/0x17c
[14818.479542] [] device_unregister+0xe/0x1a
[14818.479570] [] power_supply_unregister+0x23/0x27
[14818.479601] [] sysfs_remove_battery+0x34/0x4b [battery]
[14818.479632] [] battery_notify+0x2c/0x3a [battery]
[14818.479662] [] notifier_call_chain+0x74/0xa1
[14818.479692] [] __blocking_notifier_call_chain+0x6c/0x89
[14818.479722] [] blocking_notifier_call_chain+0xf/0x11
[14818.479751] [] pm_notifier_call_chain+0x15/0x27
[14818.479770] [] enter_state+0xa7/0xd5
[14818.479782] [] state_store+0xaa/0xc0
[14818.479795] [] ? pm_async_store+0x45/0x45
[14818.479807] [] kobj_attr_store+0x17/0x19
[14818.479820] [] sysfs_write_file+0x103/0x13f
[14818.479834] [] vfs_write+0xad/0x13d
[14818.479847] [] sys_write+0x45/0x6c
[14818.479860] [] system_call_fastpath+0x16/0x1bThis patch introduces separate lock to struct acpi_battery to
grab in sysfs_remove_battery() instead of battery->lock.
So fix by Lan Tianyu is still there, we just grab independent lock.Signed-off-by: Sergey Senozhatsky
Tested-by: Lan Tianyu
Signed-off-by: Len Brown -
Currently the use of pm_runtime_put_sync() is not safe from
interrupts-disabled context because rpm_idle() will release the
spinlock and enable interrupts for the idle callbacks. This enables
interrupts during a time where interrupts were expected to be
disabled, and can have strange side effects on drivers that expected
interrupts to be disabled.This is not a bug since the documentation clearly states that only
_put_sync_suspend() is safe in IRQ-safe mode.However, pm_runtime_put_sync() could be made safe when in IRQ-safe
mode by releasing the spinlock but not re-enabling interrupts, which
is what this patch aims to do.Problem was found when using some buggy drivers that set
pm_runtime_irq_safe() and used _put_sync() in interrupts-disabled
context.Reported-by: Colin Cross
Tested-by: Nishanth Menon
Signed-off-by: Kevin Hilman
Signed-off-by: Rafael J. Wysocki -
The local variable ret is defined twice in pm_genpd_poweron(), which
causes this function to always return 0, even if the PM domain's
.power_on() callback fails, in which case an error code should be
returned.Remove the wrong second definition of ret and additionally remove an
unnecessary definition of wait from pm_genpd_poweron().Signed-off-by: Rafael J. Wysocki
-
The AMW0 function in acer-wmi works on Lenovo ideapad S205 for control
the wifi hardware state. We also found there have a 0x78 EC register
exposes the state of wifi hardware switch on the machine.So, add this patch to support Lenovo ideapad S205 wifi hardware switch
in acer-wmi driver.Reference: bko#37892
https://bugzilla.kernel.org/show_bug.cgi?id=37892Cc: Carlos Corbacho
Cc: Matthew Garrett
Cc: Dmitry Torokhov
Cc: Corentin Chary
Cc: Thomas Renninger
Tested-by: Florian Heyer
Signed-off-by: Lee, Chun-Yi
Signed-off-by: Matthew Garrett -
It seems that aliases shouldn't contain spaces, as
module-init-tools uses them as delimeters in module.alias fileSigned-off-by: Anton V. Boyarshinov
Signed-off-by: Matthew Garrett -
In the case of ideapad_backlight_init() failure,
we need to free the resources allocated by ideapad_input_init().Aslo drop __devexit annotation for ideapad_input_exit() because
we also call it in ideapad_acpi_add() error path.Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
When enabling turbo, we need to set both the TDC and TDP bits. IIRC
only the TDC one actually matters, but fix it up anyway since the
current code is confusing.Signed-off-by: Jesse Barnes
Signed-off-by: Matthew Garrett -
Some samsung latop of the N150/N2{10,20,30} serie are badly detected by the samsung-laptop platform driver, see bug # 36082.
It appears that N230 identifies itself as N150/N210/N220/N230 whereas the other identify themselves as N150/N210/220.
This patch attemtp fix #36082 allowing correct identification for all the said netbook model.Reported-by: Daniel Eklöf
Signed-off-by: Thomas Courbon
Signed-off-by: Matthew Garrett -
All of these keys are being reported on the keyboard
controller but are also generating WMI events. Add them
to the legacy keymap to silence the noise.BugLink: http://bugs.launchpad.net/bugs/815914
Signed-off-by: Seth Forshee
Signed-off-by: Matthew Garrett -
We only care about if there is any successful match from the dmi table
or no match at all, we can make dmi_check_system return immediately if
we have a successful match instead of iterate thorough the whole table.Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
This adds backlight control on the Samsung Q10 laptop, which does not support
the SABI interface. Also tested successfully on the Dell Latitude X200.Signed-off-by: Frederick van der Wyck
Signed-off-by: Matthew Garrett -
Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
And also remove unused variable 'my_id_table'.
Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
Otherwise, the error path will always be executed.
Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
The memory for td_info which is allocated in initialize_sensor()
should be properly kfreed in mid_thermal_probe() error patch and
mid_thermal_remove().Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
Signed-off-by: Axel Lin
Signed-off-by: Matthew Garrett -
The N510 benefits from this code as well. Below is a patch to include support.
Signed-off-by: Jouke Witteveen
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
ref: http://dev.iksaif.net/projects/3/wiki/Asus-laptop_WAPF
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Cc: stable@kernel.org
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett -
Signed-off-by: Corentin Chary
Signed-off-by: Matthew Garrett
