| Age | Commit message (Collapse) | Author |
|
This patch is from the Xen crew - it allows override of deciding whether
two given pages can be considered physically contigous or not. This is
similar to how we handle iommu and virtual merging.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
The below removes an __initdata
(for initarray_generic that is referenced in non-init code).
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Fix up cpufreq Makefile merge manually
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
Patch from Ben Dooks
Add PORT_S3C2440 to include/linux/serial_core.h
Signed-off-by: Ben Dooks
Signed-off-by: Russell King
|
|
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
into ppc970.osdl.org:/home/torvalds/v2.6/linux
|
|
Most of this work was done by "Mat Loikkanen" <Mat.Loikkanen@synopsys.com>.
* use struct device rather than struct pci_dev
* use generic DMA routines (dma_xxx) and generic struct device
routines (dev_xxx)
* isolate PCI-specific helpers inside CONFIG_PCI
|
|
> Put the function back, and change the pmac.h file to delete the #define,
> and replace the snd_pmac_keywest_write function with a real call to
> i2c_smbus_write_block_data so things like this don't happen again.
>
> Care to write a patch to do this?
It follows, along with an update of the include/linux/i2c.h to only
declare functions that actually exist, but grepping the whole sound
subtree shows that at least sound/oss/dmasound/tas_common.h defines
a few inline functions that call i2c_smbus_write_{byte,block}_data.
[I2C part]
Ressuscitate i2c_smbus_write_block_data since it's actually
used. Update include/linux/i2c.h to reflect the existing
functions.
[Sound part]
Remove snd_pmac_keywest_write* wrapper macros and directly
call the i2c_smbus_* functions instead.
Signed-off-by: Gabriel Paubert <paubert@iram.es>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
===== include/linux/i2c.h 1.41 vs edited =====
|
|
I am trying to fix the current ACPI container.ko and processor.ko to use
kobject_hotplug() for notification. For this I would be requiring the
KOBJ_ONLINE definitions to be added to kobject_action.
Signed-off-by: Anil Keshavamurty <anil.s.keshavamurthy@intel.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
This patch removes two fields from "struct device" that are duplicated
in "struct dev_pm_info": power_state (which should probably vanish)
and "saved_state". There were only two "real" uses of saved_state;
both are now switched over to use dev_pm_info.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
fakephp needs to add newly discovered devices to the global pci list.
Therefore seperate out the appropriate chunk from pci_bus_add_devices
to pci_bus_add_device to add a single device to sysfs, procfs
and the global device list.
Signed-off-by: Jan Dittmer <jdittmer@ppp0.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
|
|
into kroah.com:/home/greg/linux/BK/usb-2.6
|
|
It seems to result in unexplained memory corruption. Matt is working on it.
Cset exclude: Matt_Domsch@dell.com[torvalds]|ChangeSet|20041020153622|50713
|
|
This patch fixes on overflow in tc actions times reported to
userspace on 64 bit architectures. struct tcf_t only contains
32-bit timestamps, but they are initialized to jiffies. When
jiffies is larger than 2^32-1 only the low 32 bit are saved,
and the diff between jiffies and the current timestamp becomes
very large. This happens immediately after boottime since jiffies
is initialized to 2^32-300. It was invisible until now because
only the lower 32bit were reported to userspace, but with the
USER_HZ conversion the reported times start somewhere around
4294967s.
This patch extends the timestamps to 64bit. It breaks userspace
compatibility for actions, but considering that most of this is
not even in iproute yet this should be acceptable.
Signed-off-by: Patrick McHardy <kaber@trash.net>
ACK'd by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
- cdev_get is only used in fs/char_dev.c; move it up, make it static and
unexport it.
- cdev_put is used in one more place (fs/file_table.c) but never in
modules; unexport it.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
The 'faulty' personality provides a layer over any block device in which
errors may be synthesised.
A variety of errors are possible including transient and persistent read
and write errors, and read errors that persist until the next write.
There error mode can be changed on a live array.
Accessing this personality requires mdadm 2.8.0 or later.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
As the unplug timer can potentially fire at any time, and and it access
data that is released by the md ->stop function, we need to del_timer_sync
before releasing that data.
(After much discussion, we created blk_sync_queue() for this)
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Contributions from Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
Some size fields were "int" instead of "sector_t".
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
The VESA_* constants in fb.h used for power management of the display is
confusing to use. The constants seems to be meant for userspace, because
within the kernel (vt and fbdev), the constants have to be incremented by
1. Implementation of fb_blank() varies from driver to driver:
- if-else on blank/!blank
- switch case on hardcoded numbers
- switch case on the constants + 1
- switch -1, case on constants as is
- switch case on the constants as is (broken)
To make usage clearer, new constants are defined in fb.h:
FB_BLANK_UNBLANK = VESA_UNBLANKING = 0;
FB_BLANK_NORMAL = VESA_UNBLANKING + 1 = 1;
FB_BLANK_VSYNC_SUSPEND = VESA_VSYNC_SUSPEND + 1 = 2;
FB_BLANK_HSYNC_SUSPEND = VESA_HSYNC_SUSPEND + 1 = 3;
FB_BLANK_POWERDOWN = VESA_POWERDOWN + 1 = 4;
Other changes:
- generic blanking code in fbcon.c (for drivers without an fb_blank hook)
which either sets the palette to all black, or clear the screen with
black.
- make fb_display an unexportable symbol
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
The patch below renames struct reserve_window_node* and rsv_window_add()
function to struct ext3_reserve_window_node* and ext3_rsv_window_add().
This eases the task of having several ext3-derived filesystem drivers (with
different capabilities) in kernel.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
The O_SYNC speedup patches missed the generic_file_xxx_nolock cases, which
means that pages weren't actually getting sync'ed in those cases. This
patch fixes that.
Signed-off-by: Suparna Bhattacharya <suparna@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
profile_hook unconditionally takes a read lock on profile_lock if kernel
profiling is enabled. The lock protects the profile_hook notifier chain
from being written while it's being called. The routine profile_hook is
called in a very hot path though: every timer tick on every CPU. As you
can imagine, on a large system, this makes the cacheline containing
profile_lock pretty hot. Since oprofile was the only user of the
profile_hook, I removed the notifier chain altogether in favor of a simple
function pointer with the help of John Levon. This removes all of the
contention in the hot path since the variable is very seldom written and
simplifies things a little to boot.
Acked-by: John Levon <levon@movementarian.org>
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
SN9C10x driver updates.
The most important change is the addition of the "SN9C10x" vendor-specific
pixel format, which is used by the applications or libraries to get "raw"
compressed data from the SN9C10x controllers. This also means that V4L2 should
be smart enough for the decompression to be handled in userland. You can
consider this patch as a further response to the discussion we had on the lkml
about the submission of the PWC driver including decompression in kernelspace,
which is present in the Alan Cox's tree.
Changes: (+ new, - removed, * cleanup, @ bugfix)
@ Fix VIDIOC_TRY_FMT ioctl
@ Fix SOF/EOF problems with TAS5130D1B image sensor
@ Fix VIDIOC_ENUM_FMT ioctl
* Replace wait_event_interruptible() with wait_event_timeout()
* Use msecs_to_jiffies() for timeouts in jiffies
* Use usb_make_path() on VIDIOC_QUERYCAP for device path in the usb tree
* read() returns buf.bytesused instead of buf.length on success
- Remove brightness control from PAS106B and PAS202BCB, since it has no effect
on the active pixel area (it's just for window border lines)
+ Implement VIDIOC_G_PARM and VIDIOC_S_PARM ioctl's
+ Add DAC magnitude, DAC sign, green balance and exposure controls for PAS106B
and PAS202BCB image sensors
+ Add an additional pixel format for compressed video: V4L2_PIX_FMT_SN9C10X
+ VIDIOC_S_JPEGCOMP and VIDIOC_G_JPEGCOMP are used to set or get the current
compression quality
+ New documentation note in "Notes for V4L2 application developers" paragraph
about video formats and compressed data.
+ Documentation updates about the new features
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
into nuts.davemloft.net:/disk1/BK/net-2.6
|
|
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
Sun tells me:
For many years both Solaris x86 and Linux have used the same fdisk
partition id of 0x82. Solaris uses that identifier to allocate disk
space which is then further subdivided by the Solaris VTOC (Volume
Table of Contents) and Linux uses that id as the identifier for its
swap partition.
The new release of Solaris should be out early next year. Solaris
will begin using a partition id of 0xbf. We will continue to support
the older partition id value of 0x82 for compatibility reasons.
Solaris's fdisk program has been enhanced to allow system administrators
to switch back and forth between the new and old identifier without any
loss of data.
So, this may be useful to some people a few months from now.
|
|
|
|
I have directories full of typo corrections - don't know
whether you want them. Below some wierds.
|
|
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
into intel.com:/home/lenb/src/26-latest-dev
|
|
|
|
into kroah.com:/home/greg/linux/BK/i2c-2.6
|
|
|
|
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
|
|
ppdev's ioctls are not available for 32bit apps on 64bit systems. There
are four ioctls which take no argument at all (so they are compatible
between 32bit and 64bit), these numbers do not clash with any other ioctl
code, and so I see no reason why not applying patch below.
It solves problem VMware users are faced on 64bit systems if they want to
use direct access to the parallel port.
Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
ia64 and ppc64 have function descriptors. Booting with initcall_debug will
print the descriptor address, not the address and name of the actual
function. Another indirection is required.
Tested on ppc, ppc64 and ia64.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
The following adds a __KERNEL__ check to <linux/crc-ccitt.h>. The problem
is that the ppp package includes <linux/ppp_defs.h> via <net/ppp_defs.h>,
which in turn gets <linux/crc-ccitt.h>.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|
|
After 2.6.8.1, samba userland would no longer build with current
kernel headers, as it needs some of the samba kernel headers to work,
yet they included <linux/fs.h> outside of __KERNEL__.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
|