18 Jul, 2009
6 commits
-
I was reading throught the recordmcount.pl starting comment,
and spotted a tiny discrepancy.The second example is about my_func not being global, but the
example code has the ".globl my_func" statement just moved.Signed-off-by: Jiri Olsa
Cc: rostedt@goodmis.org
LKML-Reference:
Signed-off-by: Ingo Molnar -
Signed-off-by: Jiri Olsa
Cc: rostedt@goodmis.org
LKML-Reference:
Signed-off-by: Ingo Molnar -
Merge reason: tracing/core was on an older, pre-rc1 base.
Signed-off-by: Ingo Molnar
-
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: Move a dereference below a NULL test
fb/intelfb: conflict with DRM_I915 and hide by default
drm/ttm: fix misplaced parentheses
drm/via: Fix vblank IRQ on VIA hardware.
drm: drm_gem, check kzalloc retval
drm: drm_debugfs, check kmalloc retval
drm/radeon: add some missing pci ids -
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"
Add dma_debug_init() for ia64
Fix ia64 compilation IS_ERR and PTE_ERR errors. -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
x86/pci: insert ioapic resource before assigning unassigned resources
17 Jul, 2009
30 commits
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: riptide - proper handling of pci_register_driver for joystick
sound: usb-audio: add workaround for Blue Microphones devices
ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking
ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free -
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
virtio_net: Sync header with qemu
virtio-pci: correctly unregister root device on error
virtio_blk: ioctl return value fix
virtio_blk: don't bounce highmem requests
lguest: restrict CPUID to avoid perf counter wrmsr
lguest: remove unnecessary forward struct declaration
lguest: fix journey -
…nel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing/function: Fix the return value of ftrace_trace_onoff_callback() -
Whoops.. fortunately not many people use this yet.
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
asm/fpu.h uses the __IA64_UL macro which is declared in asm/types.h, so
this include is really required. Without it, GNU libc fails to build.This reverts commit 2678c07b07ac2076675e5d57653bdf02e9af1950.
Signed-off-by: Aurelien Jarno
Acked-by: Fenghua Yu -
The commit 9916219579d078c80377dd3988c2cc213536d868 was supposed to
add CONFIG_DMA_API_DEBUG support to IA64 however I forgot to add
dma_debug_init().Signed-off-by: fujita
Acked-by: Fenghua Yu -
When building ia64 kernel with CONFIG_XEN_SYS_HYPERVISOR, compiler reports
errors:drivers/xen/sys-hypervisor.c: In function ‘uuid_show’:
drivers/xen/sys-hypervisor.c:125: error: implicit declaration of function ‘IS_ERR’
drivers/xen/sys-hypervisor.c:126: error: implicit declaration of function ‘PTR_ERR’This patch fixes the errors.
Signed-off-by: Fenghua Yu
Acked-by: Isaku Yamahata -
Qemu added support for a few extra RX modes that Linux doesn't
currently make use of. Sync the headers to maintain consistency.Signed-off-by: Alex Williamson
Signed-off-by: Rusty Russell -
If pci_register_driver() fails we're incorrectly unregistering the root
device with device_unregister() rather than root_device_unregister().Reported-by: Don Zickus
Signed-off-by: Mark McLoughlin
Signed-off-by: Rusty Russell -
Block driver ioctl methods must return ENOTTY and not -ENOIOCTLCMD if
they expect the block layer to handle generic ioctls.This triggered a BLKROSET failure in xfsqa #200.
Signed-off-by: Christoph Hellwig
Signed-off-by: Rusty Russell -
By default a block driver bounces highmem requests, but virtio-blk is
perfectly fine with any request that fit into it's 64 bit addressing scheme,
mapped in the kernel virtual space or not.Besides improving performance on highmem systems this also makes the
reproducible oops in __bounce_end_io go away (but hiding the real cause).Signed-off-by: Christoph Hellwig
Signed-off-by: Rusty Russell -
Avoid the following:
[ 0.012093] WARNING: at arch/x86/kernel/apic/apic.c:249 native_apic_write_dummy+0x2f/0x40()Rather than chase each new cpuid-detected feature, just lie about the highest
valid CPUID so this code is never run.Signed-off-by: Rusty Russell
-
While fixing lg.h to drop the fwd declaration, I noticed
there's another one ;)Signed-off-by: Rusty Russell
-
fix: "make Guest" was complaining about duplicated G:032
Signed-off-by: Matias Zabaljauregui
Signed-off-by: Rusty Russell -
We can directly use %pf input format instead of kallsyms_lookup()
and %s input formatSigned-off-by: Xiao Guangrong
Reviewed-by: Li Zefan
Signed-off-by: Frederic Weisbecker -
We can directly use %pF input format instead of sprint_symbol()
and %s input format.Signed-off-by: Xiao Guangrong
Reviewed-by: Li Zefan
Signed-off-by: Frederic Weisbecker -
Rewrite the __ftrace_replace_code() function, simplify it, but don't
change the code's logic.First, we get the state we want to set, if the record has the same
state, then do nothing, otherwise enable/disable it.Signed-off-by: Xiao Guangrong
Reviewed-by: Li Zefan
Signed-off-by: Frederic Weisbecker -
ftrace_trace_onoff_callback() will return an error even if we do the
right operation, for example:# echo _spin_*:traceon:10 > set_ftrace_filter
-bash: echo: write error: Invalid argument
# cat set_ftrace_filter
#### all functions enabled ####
_spin_trylock_bh:traceon:count=10
_spin_unlock_irq:traceon:count=10
_spin_unlock_bh:traceon:count=10
_spin_lock_irq:traceon:count=10
_spin_unlock:traceon:count=10
_spin_trylock:traceon:count=10
_spin_unlock_irqrestore:traceon:count=10
_spin_lock_irqsave:traceon:count=10
_spin_lock_bh:traceon:count=10
_spin_lock:traceon:count=10We want to set _spin_*:traceon:10 to set_ftrace_filter, it complains
with "Invalid argument", but the operation is successful.This is because ftrace_process_regex() returns the number of functions that
matched the pattern. If the number is not 0, this value is returned
by ftrace_regex_write() whereas we want to return the number of bytes
virtually written.
Also the file offset pointer is not updated in this case.If the number of matched functions is lower than the number of bytes written
by the user, this results to a reprocessing of the string given by the user with
a lower size, leading to a malformed ftrace regex and then a -EINVAL returned.So, this patch fixes it by returning 0 if no error occured.
The fix also applies on 2.6.30Signed-off-by: Xiao Guangrong
Reviewed-by: Li Zefan
Cc: stable@kernel.org
Signed-off-by: Frederic Weisbecker -
kernel/trace/ring_buffer.c: In function 'rb_tail_page_update':
kernel/trace/ring_buffer.c:849: warning: value computed is not used
kernel/trace/ring_buffer.c:850: warning: value computed is not usedAdd "(void)"s to fix this warning, because we don't need here to handle
the fail case of cmpxchg, it's fine if an interrupt already did the
job.Changed from V1:
Add a comment(which is written by Steven) for it.Signed-off-by: Lai Jiangshan
Acked-by: Steven Rostedt
Signed-off-by: Frederic Weisbecker -
…l/git/peterz/linux-2.6-sched
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-sched:
sched: Fix bug in SCHED_IDLE interaction with group scheduling
sched: Fix rt_rq->pushable_tasks initialization in init_rt_rq()
sched: Reset sched stats on fork()
sched_rt: Fix overload bug on rt group scheduling
sched: Documentation/sched-rt-group: Fix style issues & bump version -
…el/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timer stats: fix quick check optimization -
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix another bug in move of altivec code to vector.S
powerpc: Fix booke user_disable_single_step() -
If a tty in N_TTY mode with echo enabled manages to get itself into a state
where
- echo characters are pending
- FASYNC is enabled
- tty_write_wakeup is called from either
- a device write path (pty)
- an IRQ (serial)then it either deadlocks or explodes taking a mutex in the IRQ path.
On the serial side it is almost impossible to reproduce because you have to
go from a full serial port to a near empty one with echo characters
pending. The pty case happens to have become possible to trigger using
emacs and ptys, the pty changes having created a scenario which shows up
this bug.The code path is
n_tty:process_echoes() (takes mutex)
tty_io:tty_put_char()
pty:pty_write (or serial paths)
tty_wakeup (from pty_write or serial IRQ)
n_tty_write_wakeup()
process_echoes()
*KABOOM*Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
Don't forget to drop a tty refererence on fail paths in
receive_data().Signed-off-by: Jiri Slaby
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
Bootmem is not used for the vt screen buffer anymore as slab is now
available at the time the console is initialized.Get rid of the now superfluous distinction between slab and bootmem,
it's always slab.This also fixes a kmalloc leak which Catalin described thusly:
Commit a5f4f52e ("vt: use kzalloc() instead of the bootmem allocator")
replaced the alloc_bootmem() with kzalloc() but didn't set vc_kmalloced to
1 and the memory block is later leaked. The corresponding kmemleak trace:unreferenced object 0xdf828000 (size 8192):
comm "swapper", pid 0, jiffies 4294937296
backtrace:
[] __save_stack_trace+0x17/0x1c
[] log_early+0x55/0x84
[] kmemleak_alloc+0x33/0x3c
[] __kmalloc+0xd7/0xe4
[] con_init+0xbf/0x1b8
[] console_init+0x11/0x20
[] start_kernel+0x137/0x1e4Signed-off-by: Johannes Weiner
Reviewed-by: Pekka Enberg
Tested-by: Catalin Marinas
Signed-off-by: Andrew Morton
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
dcb314@hotmail.com notes that this memset has its args reversed.
It's unneeded anyway, so remove it.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13587
Signed-off-by: Andrew Morton
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
msm_serial_driver is registered using platform_driver_probe which takes
care for the probe function itself. So don't pass it in the driver
struct, too.Signed-off-by: Uwe Kleine-König
Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
We can get a situation where a hangup occurs during or after a close. In
that case the ldisc gets disposed of by the close and the hangup then
explodes.Signed-off-by: Alan Cox
Signed-off-by: Linus Torvalds -
Turning on this flag could prevent the compiler from optimising away
some "useless" checks for null pointers. Such bugs can sometimes become
exploitable at compile time because of the -O2 optimisation.See http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Optimize-Options.html
An example that clearly shows this 'problem' is commit 6bf67672.
static void __devexit agnx_pci_remove(struct pci_dev *pdev)
{
struct ieee80211_hw *dev = pci_get_drvdata(pdev);
- struct agnx_priv *priv = dev->priv;
+ struct agnx_priv *priv;
AGNX_TRACE;if (!dev)
return;
+ priv = dev->priv;By reverting this patch, and compile it with and without
-fno-delete-null-pointer-checks flag, we can see that the check for dev
is compiled away.call printk #
- testq %r12, %r12 # dev
- je .L94 #,
movq %r12, %rdi # dev,Clearly the 'fix' is to stop using dev before it is tested, but building
with -fno-delete-null-pointer-checks flag at least makes it harder to
abuse.Signed-off-by: Eugene Teo
Acked-by: Eric Paris
Acked-by: Wang Cong
Signed-off-by: Linus Torvalds -
This reverts commit a6540f731d506d9e82444cf0020e716613d4c46c, as
requested by Alan:"... as it was wrong, the pty code is now fixed and the fact this
isn't reverted is breaking pptp setups."Requested-by: Alan Cox
Signed-off-by: Linus Torvalds
16 Jul, 2009
4 commits
-
* fix/usb-audio:
sound: usb-audio: add workaround for Blue Microphones devices -
* fix/misc:
ALSA: riptide - proper handling of pci_register_driver for joystick -
* fix/hda:
ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking -
* fix/asoc:
ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free
