Linux 2.6.28.9
Subsystems (21)
I'm announcing the release of the 2.6.28.9 kernel.
It contains a wide range of bugfixes, and all users of the 2.6.28 kernel series are strongly encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.28.8 and 2.6.28.9
The updated 2.6.28.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.28.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.28.y.git;a=summarythanks,
greg k-h
------------
Makefile | 5 ++- arch/ia64/Kconfig | 3 - arch/powerpc/sysdev/fsl_soc.c | 2 - arch/s390/lib/div64.c | 2 - arch/x86/include/asm/msr-index.h | 29 ++++++++++++++++++ arch/x86/kernel/cpu/intel.c | 13 ++++++++ drivers/ata/ata_piix.c | 37 ++++++++++++++++++++++++ drivers/gpu/drm/drm_irq.c | 18 +++++++++-- drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++----- drivers/gpu/drm/i915/i915_irq.c | 6 +++ drivers/md/dm-crypt.c | 43 ++++++++++++++++++++-------- drivers/md/dm-io.c | 2 + drivers/md/dm-ioctl.c | 3 + drivers/md/dm.c | 32 ++++++++++++-------- drivers/media/video/cx23885/cx23885-417.c | 3 + drivers/media/video/cx23885/cx23885-video.c | 5 +-- drivers/misc/thinkpad_acpi.c | 8 ++--- drivers/usb/class/usbtmc.c | 4 +- drivers/usb/core/devio.c | 12 ++++--- drivers/usb/host/ehci-q.c | 3 + drivers/usb/host/ehci-sched.c | 10 ++---- drivers/usb/serial/cp2101.c | 1 drivers/usb/serial/ftdi_sio.c | 5 +++ drivers/usb/serial/ftdi_sio.h | 20 +++++++++++++ drivers/usb/serial/option.c | 12 +++---- drivers/usb/storage/unusual_devs.h | 16 +++++++++- fs/aio.c | 37 +++++++++++++++++------- fs/ecryptfs/crypto.c | 39 ++++++++++++++++--------- fs/nfsd/nfs4xdr.c | 1 include/linux/capability.h | 6 ++- init/Kconfig | 30 +++++++++---------- sound/core/oss/pcm_oss.c | 4 +- sound/core/sgbuf.c | 7 ++-- sound/isa/opl3sa2.c | 18 +++++++---- sound/pci/hda/hda_intel.c | 39 ++++++++++++++++--------- sound/pci/mixart/mixart.c | 1 36 files changed, 363 insertions(+), 133 deletions(-)
Achilleas Kotsis (1):
USB: Add device id for Option GTM380 to option driver
Alan Stern (2):
USB: usbfs: keep async URBs until the device file is closed
USB: EHCI: expedite unlinks when the root hub is suspended
Albert Pauw (1):
USB: option.c: add ZTE 622 modem device
Andy Walls (1):
V4L/DVB (10218): cx23885: Fix Oops for mixed install of analog and digital only cards
Axel Wachtler (1):
USB: serial: add FTDI USB/Serial converter devices
Benny Halevy (1):
NFSD: provide encode routine for OP_OPENATTR
Dan Williams (1):
USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530
Davide Libenzi (1):
eventfd: remove fput() call from possible IRQ context
Dirk Hohndel (1):
USB: Add Vendor/Product ID for new CDMA U727 to option driver
Eric Anholt (3):
drm/i915: Don't double-unpin buffers if we take a signal in evict_everything(). drm/i915: Don't print to dmesg when taking signal during object_pin. drm/i915: Don't allow objects to get bound while VT switched.
Greg Kroah-Hartman (3):
USB: usbtmc: fix stupid bug in open()
USB: usbtmc: add protocol 1 support
Linux 2.6.28.9
Huang Ying (1):
dm crypt: fix kcryptd_async_done parameter
J. Bruce Fields (1):
nfsd: nfsd should drop CAP_MKNOD for non-root
Jan Dumon (1):
USB: unusual_devs: Add support for GI 0431 SD-Card interface
Jesse Barnes (2):
drm/i915: set vblank enabled flag correctly across IRQ install/uninstall drm/i915: don't enable vblanks on disabled pipes
Jiri Slaby (2):
ALSA: mixart, fix lock imbalance
ALSA: pcm_oss, fix locking typo
Joe Korty (1):
Fix misreporting of #cores as #hyperthreads for Q9550
Johns Daniel (1):
powerpc: Remove extra semicolon in fsl_soc.c
Karsten Wiese (1):
USB: EHCI: Fix isochronous URB leak
Krzysztof Helt (1):
ALSA: opl3sa2 - Fix NULL dereference when suspending snd_opl3sa2
Linus Torvalds (2):
Add '-fwrapv' to gcc CFLAGS
Move cc-option to below arch-specific setup
Martin Schwidefsky (1):
S390: __div64_31 broken for CONFIG_MARCH_G5
Mathieu Chouquet-Stringer (1):
thinkpad-acpi: fix module autoloading for older models
Michael Hennerich (1):
USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
Mikulas Patocka (1):
dm io: respect BIO_MAX_PAGES limit
Milan Broz (2):
dm ioctl: validate name length when renaming dm crypt: wait for endio to complete before destruction
Moritz Muehlenhoff (1):
USB: Updated unusual-devs entry for USB mass storage on Nokia 6233
Randy Dunlap (1):
menu: fix embedded menu snafu
Robert M. Kenney (1):
USB: serial: new cp2101 device id
Takashi Iwai (3):
ALSA: Fix vunmap and free order in snd_free_sgbuf_pages()
ALSA: hda - Fix DMA mask for ATI controllers
ALSA: hda - Workaround for buggy DMA position on ATI controllers
Tejun Heo (1):
ata_piix: add workaround for Samsung DB-P70
Thomas Bartosik (1):
USB: storage: Unusual USB device Prolific 2507 variation added
Tony Luck (1):
Build fix for __early_pfn_to_nid() undefined link error
Tyler Hicks (1):
eCryptfs: Allocate a variable number of pages for file headers
Makefile +4 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 28 -EXTRAVERSION = .8 +EXTRAVERSION = .9 NAME = Erotic Pickled Herring # *DOCUMENTATION*
@@ -555,6 +555,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) # disable pointer signed / unsigned warnings in gcc 4.0 KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) +# disable invalid "can't wrap" optimzations for signed / pointers +KBUILD_CFLAGS += $(call cc-option,-fwrapv) + # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments # But warn user when we do so warn-assign = \
arch/ia64/Kconfig +1 -2
@@ -479,8 +479,7 @@ config HOLES_IN_ZONE default y if VIRTUAL_MEM_MAP config HAVE_ARCH_EARLY_PFN_TO_NID - def_bool y - depends on NEED_MULTIPLE_NODES + def_bool NUMA && SPARSEMEM config HAVE_ARCH_NODEDATA_EXTENSION def_bool y
arch/powerpc/sysdev/fsl_soc.c +1 -1
@@ -257,7 +257,7 @@ static int __init gfar_mdio_of_init(void)gfar_mdio_of_init_one (np);/* try the deprecated version */ -for_each_compatible_node (np,"mdio" ,"gianfar" ); +for_each_compatible_node (np,"mdio" ,"gianfar" )gfar_mdio_of_init_one (np);return 0 ;
arch/s390/lib/div64.c +1 -1
@@ -61,7 +61,7 @@ static uint32_t __div64_31(uint64_t *n, uint32_t base)" clr %0,%3\n" " jl 0f\n" " slr %0,%3\n" -" alr %1,%2\n" +" ahi %1,1\n" "0:\n" : "+d" (reg2), "+d" (reg3), "=d" (tmp) : "d" (base), "2" (1UL) : "cc" );
arch/x86/include/asm/msr-index.h +29 -0
@@ -200,6 +200,35 @@#define MSR_IA32_THERM_STATUS 0x0000019c#define MSR_IA32_MISC_ENABLE 0x000001a0 +/* MISC_ENABLE bits: architectural */ +#define MSR_IA32_MISC_ENABLE_FAST_STRING (1ULL << 0) +#define MSR_IA32_MISC_ENABLE_TCC (1ULL << 1) +#define MSR_IA32_MISC_ENABLE_EMON (1ULL << 7) +#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << 11) +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << 12) +#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP (1ULL << 16) +#define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << 18) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1ULL << 22) +#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1ULL << 23) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << 34) + +/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */ +#define MSR_IA32_MISC_ENABLE_X87_COMPAT (1ULL << 2) +#define MSR_IA32_MISC_ENABLE_TM1 (1ULL << 3) +#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE (1ULL << 4) +#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE (1ULL << 6) +#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK (1ULL << 8) +#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE (1ULL << 9) +#define MSR_IA32_MISC_ENABLE_FERR (1ULL << 10) +#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX (1ULL << 10) +#define MSR_IA32_MISC_ENABLE_TM2 (1ULL << 13) +#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE (1ULL << 19) +#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK (1ULL << 20) +#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT (1ULL << 24) +#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE (1ULL << 37) +#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << 38) +#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << 39) +/* Intel Model 6 */ #define MSR_P6_EVNTSEL0 0x00000186#define MSR_P6_EVNTSEL1 0x00000187
arch/x86/kernel/cpu/intel.c +13 -0
@@ -30,6 +30,19 @@static void __cpuinit early_init_intel (struct cpuinfo_x86 *c) { +/* Unmask CPUID levels if masked: */ +if (c->x86 ==6 && c->x86_model >=15 ) { +u64 misc_enable; + +rdmsrl (MSR_IA32_MISC_ENABLE , misc_enable); + +if (misc_enable &MSR_IA32_MISC_ENABLE_LIMIT_CPUID ) { + misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID ; +wrmsrl (MSR_IA32_MISC_ENABLE , misc_enable); + c->cpuid_level =cpuid_eax (0 ); + } + } +if ((c->x86 ==0xf && c->x86_model >=0x03 ) || (c->x86 ==0x6 && c->x86_model >=0x0e ))set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC );
drivers/ata/ata_piix.c +37 -0
@@ -1294,6 +1294,39 @@ static const int *__devinit piix_init_sata_map(struct pci_dev *pdev,return map; } +static bool piix_no_sidpr (struct ata_host *host) +{ +struct pci_dev *pdev =to_pci_dev (host->dev); + +/* +* Samsung DB-P70 only has three ATA ports exposed and +* curiously the unconnected first port reports link online +* while not responding to SRST protocol causing excessive +* detection delay. +* +* Unfortunately, the system doesn't carry enough DMI +* information to identify the machine but does have subsystem +* vendor and device set. As it's unclear whether the +* subsystem vendor/device is used only for this specific +* board, the port can't be disabled solely with the +* information; however, turning off SIDPR access works around +* the problem. Turn it off. +* +* This problem is reported in bnc#441240. +* +* https://bugzilla.novell.com/show_bug.cgi?id=441420 +*/ +if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==0x2920 && + pdev->subsystem_vendor ==PCI_VENDOR_ID_SAMSUNG && + pdev->subsystem_device ==0xb049 ) { +dev_printk (KERN_WARNING , host->dev, +"Samsung DB-P70 detected, disabling SIDPR\n" ); +return true; + } + +return false; +} +static int __devinit piix_init_sidpr (struct ata_host *host) {struct pci_dev *pdev =to_pci_dev (host->dev);
@@ -1307,6 +1340,10 @@ static int __devinit piix_init_sidpr(struct ata_host *host)if (hpriv->map[i] ==IDE )return 0 ; +/* is it blacklisted? */ +if (piix_no_sidpr (host)) +return 0 ; +if (!(host->ports[0 ]->flags &PIIX_FLAG_SIDPR ))return 0 ;
drivers/gpu/drm/drm_irq.c +15 -3
@@ -259,7 +259,8 @@ EXPORT_SYMBOL(drm_irq_install);*/ int drm_irq_uninstall (struct drm_device * dev) { -int irq_enabled; +unsigned long irqflags; +int irq_enabled, i;if (!drm_core_check_feature (dev,DRIVER_HAVE_IRQ ))return -EINVAL ;
@@ -269,6 +270,16 @@ int drm_irq_uninstall(struct drm_device * dev) dev->irq_enabled =0 ;mutex_unlock (&dev->struct_mutex); +/* +* Wake up any waiters so they don't hang. +*/ +spin_lock_irqsave (&dev->vbl_lock, irqflags); +for (i =0 ; i < dev->num_crtcs; i++) { +DRM_WAKEUP (&dev->vbl_queue[i]); + dev->vblank_enabled[i] =0 ; + } +spin_unlock_irqrestore (&dev->vbl_lock, irqflags); +if (!irq_enabled)return -EINVAL ;
@@ -617,8 +628,9 @@ int drm_wait_vblank(struct drm_device *dev, void *data,DRM_DEBUG ("waiting on vblank count %d, crtc %d\n" , vblwait->request.sequence, crtc);DRM_WAIT_ON (ret, dev->vbl_queue[crtc],3 *DRM_HZ , - ((drm_vblank_count (dev, crtc) - - vblwait->request.sequence) <= (1 <<23 ))); + (((drm_vblank_count (dev, crtc) - + vblwait->request.sequence) <= (1 <<23 )) || + !dev->irq_enabled));if (ret != -EINTR ) {struct timeval now;
drivers/gpu/drm/i915/i915_gem.c +13 -7
@@ -1161,6 +1161,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)struct drm_mm_node *free_space;int page_count, ret; +if (dev_priv->mm.suspended) +return -EBUSY ;if (alignment ==0 ) alignment =PAGE_SIZE ;if (alignment & (PAGE_SIZE -1 )) {
@@ -2029,13 +2031,15 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,/* error other than GTT full, or we've already tried again */ if (ret != -ENOMEM || pin_tries >=1 ) { -DRM_ERROR ("Failed to pin buffers %d\n" , ret); +if (ret != -ERESTARTSYS ) +DRM_ERROR ("Failed to pin buffers %d\n" , ret); goto err; }/* unpin all of our buffers */ for (i =0 ; i < pinned; i++)i915_gem_object_unpin (object_list[i]); + pinned =0 ;/* evict everyone we can from the aperture */ ret =i915_gem_evict_everything (dev);
@@ -2178,7 +2182,8 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)if (obj_priv->gtt_space ==NULL ) { ret =i915_gem_object_bind_to_gtt (obj, alignment);if (ret !=0 ) { -DRM_ERROR ("Failure to bind: %d" , ret); +if (ret != -EBUSY && ret != -ERESTARTSYS ) +DRM_ERROR ("Failure to bind: %d" , ret);return ret; } }
@@ -2700,20 +2705,21 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data, dev_priv->mm.wedged =0 ; } - ret =i915_gem_init_ringbuffer (dev); -if (ret !=0 ) -return ret; - dev_priv->mm.gtt_mapping =io_mapping_create_wc (dev->agp->base, dev->agp->agp_info.aper_size *1024 *1024 );mutex_lock (&dev->struct_mutex); + dev_priv->mm.suspended =0 ; + + ret =i915_gem_init_ringbuffer (dev); +if (ret !=0 ) +return ret; +BUG_ON (!list_empty (&dev_priv->mm.active_list));BUG_ON (!list_empty (&dev_priv->mm.flushing_list));BUG_ON (!list_empty (&dev_priv->mm.inactive_list));BUG_ON (!list_empty (&dev_priv->mm.request_list)); - dev_priv->mm.suspended =0 ;mutex_unlock (&dev->struct_mutex);drm_irq_install (dev);
drivers/gpu/drm/i915/i915_irq.c +6 -0
@@ -400,6 +400,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe) {drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;unsigned long irqflags; +int pipeconf_reg = (pipe ==0 ) ?PIPEACONF :PIPEBCONF ; +u32 pipeconf; + + pipeconf =I915_READ (pipeconf_reg); +if (!(pipeconf &PIPEACONF_ENABLE )) +return -EINVAL ;spin_lock_irqsave (&dev_priv->user_irq_lock, irqflags);if (IS_I965G (dev))
drivers/md/dm-crypt.c +31 -12
94 lines not on this page · raw message
drivers/md/dm-io.c +2 -0
@@ -292,6 +292,8 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where, (PAGE_SIZE >> SECTOR_SHIFT)); num_bvecs =1 +min_t (int,bio_get_nr_vecs (where->bdev), num_bvecs); +if (unlikely (num_bvecs >BIO_MAX_PAGES )) + num_bvecs =BIO_MAX_PAGES ; bio =bio_alloc_bioset (GFP_NOIO , num_bvecs, io->client->bios); bio->bi_sector = where->sector + (where->count - remaining); bio->bi_bdev = where->bdev;
drivers/md/dm-ioctl.c +2 -1
@@ -704,7 +704,8 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)char *new_name = (char *) param + param->data_start;if (new_name < param->data || -invalid_str (new_name, (void *) param + param_size)) { +invalid_str (new_name, (void *) param + param_size) || +strlen (new_name) >DM_NAME_LEN -1 ) {DMWARN ("Invalid new logical volume name supplied." );return -EINVAL ; }
drivers/md/dm.c +19 -13
@@ -480,9 +480,12 @@ static int __noflush_suspending(struct mapped_device *md)static void dec_pending (struct dm_io *io,int error) {unsigned long flags; +int io_error; +struct bio *bio; +struct mapped_device *md = io->md;/* Push-back supersedes any I/O errors */ -if (error && !(io->error >0 &&__noflush_suspending (io->md))) +if (error && !(io->error >0 &&__noflush_suspending (md))) io->error = error;if (atomic_dec_and_test (&io->io_count)) {
@@ -492,25 +495,28 @@ static void dec_pending(struct dm_io *io, int error)* This must be handled before the sleeper on * suspend queue merges the pushback list. */ -spin_lock_irqsave (&io->md->pushback_lock, flags); -if (__noflush_suspending (io->md)) -bio_list_add (&io->md->pushback, io->bio); +spin_lock_irqsave (&md->pushback_lock, flags); +if (__noflush_suspending (md)) +bio_list_add (&md->pushback, io->bio);else /* noflush suspend was interrupted. */ io->error = -EIO ; -spin_unlock_irqrestore (&io->md->pushback_lock, flags); +spin_unlock_irqrestore (&md->pushback_lock, flags); }end_io_acct (io); -if (io->error !=DM_ENDIO_REQUEUE ) { -blk_add_trace_bio (io->md->queue, io->bio, + io_error = io->error; + bio = io->bio; + +free_io (md, io); + +if (io_error !=DM_ENDIO_REQUEUE ) { +blk_add_trace_bio (md->queue, io->bio,BLK_TA_COMPLETE ); -bio_endio (io->bio, io->error); +bio_endio (bio, io_error); } - -free_io (io->md, io); } }
@@ -518,6 +524,7 @@ static void clone_endio(struct bio *bio, int error) {int r =0 ;struct dm_target_io *tio = bio->bi_private; +struct dm_io *io = tio->io;struct mapped_device *md = tio->io->md;dm_endio_fn endio = tio->ti->type->end_io;
@@ -541,15 +548,14 @@ static void clone_endio(struct bio *bio, int error) } } -dec_pending (tio->io, error); -/* * Store md for cleanup instead of tio which is about to get freed. */ bio->bi_private = md->bs; -bio_put (bio);free_tio (md, tio); +bio_put (bio); +dec_pending (io, error); } static sector_t max_io_len(struct mapped_device *md,
drivers/media/video/cx23885/cx23885-417.c +2 -1
@@ -1585,7 +1585,8 @@ static int mpeg_open(struct inode *inode, struct file *file)lock_kernel ();list_for_each (list, &cx23885_devlist) { h = list_entry(list, struct cx23885_dev, devlist); -if (h->v4l_device->minor == minor) { +if (h->v4l_device && + h->v4l_device->minor == minor) { dev = h;break ; }
drivers/media/video/cx23885/cx23885-video.c +3 -2
@@ -730,12 +730,13 @@ static int video_open(struct inode *inode, struct file *file)lock_kernel ();list_for_each (list, &cx23885_devlist) { h = list_entry(list, struct cx23885_dev, devlist); -if (h->video_dev->minor == minor) { +if (h->video_dev && + h->video_dev->minor == minor) { dev = h; type =V4L2_BUF_TYPE_VIDEO_CAPTURE ; }if (h->vbi_dev && - h->vbi_dev->minor == minor) { + h->vbi_dev->minor == minor) { dev = h; type =V4L2_BUF_TYPE_VBI_CAPTURE ; }
drivers/misc/thinkpad_acpi.c +4 -4
@@ -6927,7 +6927,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);* if it is not there yet. */ #define IBM_BIOS_MODULE_ALIAS (__type) \ - MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") + MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")/* Non-ancient thinkpads */ MODULE_ALIAS ("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*" );
@@ -6936,9 +6936,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");/* Ancient thinkpad BIOSes have to be identified by * BIOS type or model number, and there are far less * BIOS types than model numbers... */ -IBM_BIOS_MODULE_ALIAS ("I[B,D,H,I,M,N,O,T,W,V,Y,Z]" ); -IBM_BIOS_MODULE_ALIAS ("1[0,3,6,8,A-G,I,K,M-P,S,T]" ); -IBM_BIOS_MODULE_ALIAS ("K[U,X-Z]" ); +IBM_BIOS_MODULE_ALIAS ("I[BDHIMNOTWVYZ]" ); +IBM_BIOS_MODULE_ALIAS ("1[0368A-GIKM-PST]" ); +IBM_BIOS_MODULE_ALIAS ("K[UX-Z]" );MODULE_AUTHOR ("Borislav Deianov, Henrique de Moraes Holschuh" );MODULE_DESCRIPTION (TPACPI_DESC );
drivers/usb/class/usbtmc.c +3 -1
@@ -49,6 +49,7 @@static struct usb_device_id usbtmc_devices[] = { {USB_INTERFACE_INFO (USB_CLASS_APP_SPEC ,3 ,0 ), }, + {USB_INTERFACE_INFO (USB_CLASS_APP_SPEC ,3 ,1 ), }, {0 , }/* terminating entry */ };MODULE_DEVICE_TABLE (usb, usbtmc_devices);
@@ -105,12 +106,13 @@ static int usbtmc_open(struct inode *inode, struct file *filp) {struct usb_interface *intf;struct usbtmc_device_data *data; -int retval = -ENODEV ; +int retval =0 ; intf =usb_find_interface (&usbtmc_driver,iminor (inode));if (!intf) { printk(KERN_ERR KBUILD_MODNAME ": can not find device for minor %d", iminor(inode)); + retval = -ENODEV ; goto exit; }
drivers/usb/core/devio.c +7 -5
@@ -359,11 +359,6 @@ static void destroy_async(struct dev_state *ps, struct list_head *list)spin_lock_irqsave (&ps->lock, flags); }spin_unlock_irqrestore (&ps->lock, flags); - as =async_getcompleted (ps); -while (as) { -free_async (as); - as =async_getcompleted (ps); - } } static void destroy_async_on_interface(struct dev_state *ps,
@@ -642,6 +637,7 @@ static int usbdev_release(struct inode *inode, struct file *file)struct dev_state *ps = file->private_data;struct usb_device *dev = ps->dev;unsigned int ifnum; +struct async *as;usb_lock_device (dev);
@@ -660,6 +656,12 @@ static int usbdev_release(struct inode *inode, struct file *file)usb_unlock_device (dev);usb_put_dev (dev);put_pid (ps->disc_pid); + + as =async_getcompleted (ps); +while (as) { +free_async (as); + as =async_getcompleted (ps); + }kfree (ps);return 0 ; }
drivers/usb/host/ehci-q.c +2 -1
@@ -1095,7 +1095,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh) prev->qh_next = qh->qh_next;wmb (); -if (unlikely (ehci_to_hcd (ehci)->state ==HC_STATE_HALT )) { +/* If the controller isn't running, we don't have to wait for it */ +if (unlikely (!HC_IS_RUNNING (ehci_to_hcd (ehci)->state))) {/* if (unlikely (qh->reclaim != 0)) * this will recurse, probably not much */
drivers/usb/host/ehci-sched.c +4 -6
@@ -1536,7 +1536,7 @@ itd_link_urb ( struct ehci_itd, itd_list);list_move_tail (&itd->itd_list, &stream->td_list); itd->stream =iso_stream_get (stream); - itd->urb =usb_get_urb (urb); + itd->urb = urb;itd_init (ehci, stream, itd); }
@@ -1645,7 +1645,7 @@ itd_complete ( (void )disable_periodic (ehci);ehci_to_hcd (ehci)->self.bandwidth_isoc_reqs--; -if (unlikely (list_empty (&stream->td_list))) { +if (unlikely (list_is_singular (&stream->td_list))) {ehci_to_hcd (ehci)->self.bandwidth_allocated -= stream->bandwidth; ehci_vdbg (ehci,
@@ -1656,7 +1656,6 @@ itd_complete (iso_stream_put (ehci, stream); done: -usb_put_urb (urb); itd->urb =NULL ;if (ehci->clock_frame != itd->frame || itd->index[7 ] !=-1 ) {/* OK to recycle this ITD now. */
@@ -1949,7 +1948,7 @@ sitd_link_urb ( struct ehci_sitd, sitd_list);list_move_tail (&sitd->sitd_list, &stream->td_list); sitd->stream =iso_stream_get (stream); - sitd->urb =usb_get_urb (urb); + sitd->urb = urb;sitd_patch (ehci, stream, sitd, sched, packet); sitd_link (ehci, (next_uframe >> 3) % ehci->periodic_size,
@@ -2034,7 +2033,7 @@ sitd_complete ( (void )disable_periodic (ehci);ehci_to_hcd (ehci)->self.bandwidth_isoc_reqs--; -if (list_empty (&stream->td_list)) { +if (list_is_singular (&stream->td_list)) {ehci_to_hcd (ehci)->self.bandwidth_allocated -= stream->bandwidth; ehci_vdbg (ehci,
@@ -2045,7 +2044,6 @@ sitd_complete (iso_stream_put (ehci, stream);/* OK to recycle this SITD now that its completion callback ran. */ done: -usb_put_urb (urb); sitd->urb =NULL ; sitd->stream =NULL ;list_move (&sitd->sitd_list, &stream->free_list);
drivers/usb/serial/cp2101.c +1 -0
@@ -79,6 +79,7 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ + { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
drivers/usb/serial/ftdi_sio.c +5 -0
@@ -660,6 +660,11 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) }, { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) }, + { USB_DEVICE(ATMEL_VID, STK541_PID) }, + { USB_DEVICE(DE_VID, STB_PID) }, + { USB_DEVICE(DE_VID, WHT_PID) }, + { USB_DEVICE(ADI_VID, ADI_GNICE_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio.h +20 -0
@@ -881,6 +881,26 @@#define RATOC_PRODUCT_ID_USB60F 0xb020/* +* Atmel STK541 +*/ +#define ATMEL_VID 0x03eb/* Vendor ID */ +#define STK541_PID 0x2109/* Zigbee Controller */ + +/* +* Dresden Elektronic Sensor Terminal Board +*/ +#define DE_VID 0x1cf1/* Vendor ID */ +#define STB_PID 0x0001/* Sensor Terminal Board */ +#define WHT_PID 0x0004/* Wireless Handheld Terminal */ + +/* +* Blackfin gnICE JTAG +* http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice +*/ +#define ADI_VID 0x0456 +#define ADI_GNICE_PID 0xF000 + +/* * BmRequestType: 1100 0000b * bRequest: FTDI_E2_READ * wValue: 0
drivers/usb/serial/option.c +6 -6
@@ -89,6 +89,7 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po#define OPTION_PRODUCT_ETNA_MODEM_GT 0x7041#define OPTION_PRODUCT_ETNA_MODEM_EX 0x7061#define OPTION_PRODUCT_ETNA_KOI_MODEM 0x7100 +#define OPTION_PRODUCT_GTM380_MODEM 0x7201#define HUAWEI_VENDOR_ID 0x12D1#define HUAWEI_PRODUCT_E600 0x1001
@@ -190,6 +191,7 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po/* OVATION PRODUCTS */ #define NOVATELWIRELESS_PRODUCT_MC727 0x4100#define NOVATELWIRELESS_PRODUCT_MC950D 0x4400 +#define NOVATELWIRELESS_PRODUCT_U727 0x5010/* FUTURE NOVATEL PRODUCTS */ #define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED 0X6000
@@ -281,14 +283,11 @@ static int option_send_setup(struct tty_struct *tty, struct usb_serial_port *po/* ZTE PRODUCTS */ #define ZTE_VENDOR_ID 0x19d2 +#define ZTE_PRODUCT_MF622 0x0001#define ZTE_PRODUCT_MF628 0x0015#define ZTE_PRODUCT_MF626 0x0031#define ZTE_PRODUCT_CDMA_TECH 0xfffe -/* Ericsson products */ -#define ERICSSON_VENDOR_ID 0x0bdb -#define ERICSSON_PRODUCT_F3507G 0x1900 -#define BENQ_VENDOR_ID 0x04a5#define BENQ_PRODUCT_H10 0x4068
@@ -317,6 +316,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) }, { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) }, { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTM380_MODEM) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
@@ -402,6 +402,7 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, /* Novatel EVDO product */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */
@@ -429,7 +430,6 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ - { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
@@ -497,10 +497,10 @@ static struct usb_device_id option_ids[] = { { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622) }, { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) }, { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, - { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */ { } /* Terminating entry */
drivers/usb/storage/unusual_devs.h +14 -2
@@ -219,7 +219,7 @@ UNUSUAL_DEV( 0x0421, 0x047c, 0x0370, 0x0610, US_FL_MAX_SECTORS_64 ),/* Reported by Manuel Osdoba <[email protected]> */ -UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x0452, +UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x9999, "Nokia", "Nokia 6233", US_SC_DEVICE, US_PR_DEVICE, NULL,
@@ -913,7 +913,9 @@ UNUSUAL_DEV( 0x066f, 0x8000, 0x0001, 0x0001, US_FL_FIX_CAPACITY ),/* Reported by Richard -=[]=- <[email protected]> */ -UNUSUAL_DEV( 0x067b, 0x2507, 0x0100, 0x0100, +/* Change to bcdDeviceMin (0x0100 to 0x0001) reported by +* Thomas Bartosik <[email protected]> */ +UNUSUAL_DEV( 0x067b, 0x2507, 0x0001, 0x0100, "Prolific Technology Inc.", "Mass Storage Device", US_SC_DEVICE, US_PR_DEVICE, NULL,
@@ -1328,6 +1330,16 @@ UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000, US_SC_DEVICE, US_PR_DEVICE, NULL, 0 ), +/* Reported by Jan Dumon <[email protected]> +* This device (wrongly) has a vendor-specific device descriptor. +* The entry is needed so usb-storage can bind to it's mass-storage +* interface as an interface driver */ +UNUSUAL_DEV( 0x0af0, 0x7501, 0x0000, 0x0000, + "Option", + "GI 0431 SD-Card", + US_SC_DEVICE, US_PR_DEVICE, NULL, + 0 ), +#ifdef CONFIG_USB_STORAGE_ISD200 UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, "ATI",
fs/aio.c +27 -10
@@ -428,7 +428,7 @@ static struct kiocb *__aio_get_req(struct kioctx *ctx) req->private =NULL ; req->ki_iovec =NULL ;INIT_LIST_HEAD (&req->ki_run_list); - req->ki_eventfd =ERR_PTR (-EINVAL ); + req->ki_eventfd =NULL ;/* Check if the completion queue has enough free space to * accept an event from this io.
@@ -470,8 +470,6 @@ static inline void really_put_req(struct kioctx *ctx, struct kiocb *req) {assert_spin_locked (&ctx->ctx_lock); -if (!IS_ERR (req->ki_eventfd)) -fput (req->ki_eventfd);if (req->ki_dtor) req->ki_dtor (req);if (req->ki_iovec != &req->ki_inline_vec)
@@ -493,8 +491,11 @@ static void aio_fput_routine(struct work_struct *data)list_del (&req->ki_list);spin_unlock_irq (&fput_lock); -/* Complete the fput */ -__fput (req->ki_filp); +/* Complete the fput(s) */ +if (req->ki_filp !=NULL ) +__fput (req->ki_filp); +if (req->ki_eventfd !=NULL ) +__fput (req->ki_eventfd);/* Link the iocb into the context's free list */ spin_lock_irq (&ctx->ctx_lock);
@@ -512,12 +513,14 @@ static void aio_fput_routine(struct work_struct *data)*/ static int __aio_put_req (struct kioctx *ctx,struct kiocb *req) { +int schedule_putreq =0 ; +dprintk (KERN_DEBUG "aio_put(%p): f_count=%ld\n" , req,atomic_long_read (&req->ki_filp->f_count));assert_spin_locked (&ctx->ctx_lock); - req->ki_users --; + req->ki_users--;BUG_ON (req->ki_users <0 );if (likely (req->ki_users))return 0 ;
@@ -525,10 +528,23 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req) req->ki_cancel =NULL ; req->ki_retry =NULL ; -/* Must be done under the lock to serialise against cancellation. -* Call this aio_fput as it duplicates fput via the fput_work. +/* +* Try to optimize the aio and eventfd file* puts, by avoiding to +* schedule work in case it is not __fput() time. In normal cases, +* we would not be holding the last reference to the file*, so +* this function will be executed w/out any aio kthread wakeup. */ -if (unlikely (atomic_long_dec_and_test (&req->ki_filp->f_count))) { +if (unlikely (atomic_long_dec_and_test (&req->ki_filp->f_count))) + schedule_putreq++; +else + req->ki_filp =NULL ; +if (req->ki_eventfd !=NULL ) { +if (unlikely (atomic_long_dec_and_test (&req->ki_eventfd->f_count))) + schedule_putreq++; +else + req->ki_eventfd =NULL ; + } +if (unlikely (schedule_putreq)) {get_ioctx (ctx);spin_lock (&fput_lock);list_add (&req->ki_list, &fput_head);
@@ -992,7 +1008,7 @@ int aio_complete(struct kiocb *iocb, long res, long res2)* eventfd. The eventfd_signal() function is safe to be called * from IRQ context. */ -if (!IS_ERR (iocb->ki_eventfd)) +if (iocb->ki_eventfd !=NULL )eventfd_signal (iocb->ki_eventfd,1 ); put_rq:
@@ -1596,6 +1612,7 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, req->ki_eventfd =eventfd_fget ((int ) iocb->aio_resfd);if (IS_ERR (req->ki_eventfd)) { ret =PTR_ERR (req->ki_eventfd); + req->ki_eventfd =NULL ; goto out_put_req; } }
fs/ecryptfs/crypto.c +26 -13
@@ -1310,14 +1310,13 @@ static int ecryptfs_write_headers_virt(char *page_virt, size_t max, }static int -ecryptfs_write_metadata_to_contents (struct ecryptfs_crypt_stat *crypt_stat, -struct dentry *ecryptfs_dentry, -char *virt) +ecryptfs_write_metadata_to_contents (struct dentry *ecryptfs_dentry, +char *virt,size_t virt_len) {int rc; rc =ecryptfs_write_lower (ecryptfs_dentry->d_inode, virt, -0 , crypt_stat->num_header_bytes_at_front); +0 , virt_len);if (rc) printk(KERN_ERR "%s: Error attempting to write header " "information to lower file; rc = [%d]\n", __func__,
@@ -1327,7 +1326,6 @@ ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat,static int ecryptfs_write_metadata_to_xattr (struct dentry *ecryptfs_dentry, -struct ecryptfs_crypt_stat *crypt_stat,char *page_virt,size_t size) {int rc;
@@ -1337,6 +1335,17 @@ ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,return rc; } +static unsigned long ecryptfs_get_zeroed_pages (gfp_t gfp_mask, +unsigned int order) +{ +struct page *page; + + page =alloc_pages (gfp_mask | __GFP_ZERO, order); +if (page) +return (unsigned long )page_address (page); +return 0 ; +} +/** * ecryptfs_write_metadata * @ecryptfs_dentry: The eCryptfs dentry
@@ -1353,7 +1362,9 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry) {struct ecryptfs_crypt_stat *crypt_stat = &ecryptfs_inode_to_private (ecryptfs_dentry->d_inode)->crypt_stat; +unsigned int order;char *virt; +size_t virt_len;size_t size =0 ;int rc =0 ;
@@ -1369,33 +1380,35 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry) rc = -EINVAL ; goto out; } + virt_len = crypt_stat->num_header_bytes_at_front; + order =get_order (virt_len);/* Released in this function */ - virt = (char *)get_zeroed_page (GFP_KERNEL ); + virt = (char *)ecryptfs_get_zeroed_pages (GFP_KERNEL , order);if (!virt) {printk (KERN_ERR "%s: Out of memory\n" , __func__); rc = -ENOMEM ; goto out; } - rc =ecryptfs_write_headers_virt (virt,PAGE_CACHE_SIZE , &size, - crypt_stat, ecryptfs_dentry); + rc =ecryptfs_write_headers_virt (virt, virt_len, &size, crypt_stat, + ecryptfs_dentry);if (unlikely (rc)) {printk (KERN_ERR "%s: Error whilst writing headers; rc = [%d]\n" , __func__, rc); goto out_free; }if (crypt_stat->flags &ECRYPTFS_METADATA_IN_XATTR ) - rc =ecryptfs_write_metadata_to_xattr (ecryptfs_dentry, - crypt_stat, virt, size); + rc =ecryptfs_write_metadata_to_xattr (ecryptfs_dentry, virt, + size);else - rc =ecryptfs_write_metadata_to_contents (crypt_stat, - ecryptfs_dentry, virt); + rc =ecryptfs_write_metadata_to_contents (ecryptfs_dentry, virt, + virt_len);if (rc) {printk (KERN_ERR "%s: Error writing metadata out to lower file; " "rc = [%d]\n" , __func__, rc); goto out_free; } out_free: -free_page ((unsigned long )virt); +free_pages ((unsigned long )virt, order); out:return rc; }
fs/nfsd/nfs4xdr.c +1 -0
@@ -2598,6 +2598,7 @@ static nfsd4_enc nfsd4_enc_ops[] = { [OP_LOOKUPP] = (nfsd4_enc)nfsd4_encode_noop, [OP_NVERIFY] = (nfsd4_enc)nfsd4_encode_noop, [OP_OPEN] = (nfsd4_enc)nfsd4_encode_open, + [OP_OPENATTR] = (nfsd4_enc)nfsd4_encode_noop, [OP_OPEN_CONFIRM] = (nfsd4_enc)nfsd4_encode_open_confirm, [OP_OPEN_DOWNGRADE] = (nfsd4_enc)nfsd4_encode_open_downgrade, [OP_PUTFH] = (nfsd4_enc)nfsd4_encode_noop,
include/linux/capability.h +4 -2
@@ -382,8 +382,10 @@ typedef struct kernel_cap_struct {# define CAP_FULL_SET ((kernel_cap_t){{ ~0, ~0 }})# define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})# define CAP_FS_SET ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } }) -# define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \ - CAP_FS_MASK_B1 } }) +# define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0 \ + | CAP_TO_MASK(CAP_SYS_RESOURCE) \ + | CAP_TO_MASK(CAP_MKNOD), \ + CAP_FS_MASK_B1 } })#endif /* _KERNEL_CAPABILITY_U32S != 2 */
init/Kconfig +15 -15
@@ -538,6 +538,9 @@ config CC_OPTIMIZE_FOR_SIZE config SYSCTL bool +config ANON_INODES + bool + menuconfig EMBEDDED bool "Configure standard kernel features (for small systems)" help
@@ -643,18 +646,6 @@ config PCSPKR_PLATFORM This option allows to disable the internal PC-Speaker support, saving some memory. -config COMPAT_BRK - bool "Disable heap randomization" - default y - help - Randomizing heap placement makes heap exploits harder, but it - also breaks ancient binaries (including anything libc5 based). - This option changes the bootup default to heap randomization - disabled, and can be overriden runtime by setting - /proc/sys/kernel/randomize_va_space to 2. - - On non-ancient distros (post-2000 ones) N is usually a safe choice. - config BASE_FULL default y bool "Enable full-sized data structures for core" if EMBEDDED
@@ -672,9 +663,6 @@ config FUTEX support for "fast userspace mutexes". The resulting kernel may not run glibc-based applications correctly. -config ANON_INODES - bool - config EPOLL bool "Enable eventpoll support" if EMBEDDED default y
@@ -760,6 +748,18 @@ config SLUB_DEBUG SLUB sysfs support. /sys/slab will not exist and there will be no support for cache validation etc. +config COMPAT_BRK + bool "Disable heap randomization" + default y + help + Randomizing heap placement makes heap exploits harder, but it + also breaks ancient binaries (including anything libc5 based). + This option changes the bootup default to heap randomization + disabled, and can be overriden runtime by setting + /proc/sys/kernel/randomize_va_space to 2. + + On non-ancient distros (post-2000 ones) N is usually a safe choice. + choice prompt "Choose SLAB allocator" default SLUB
sound/core/oss/pcm_oss.c +2 -2
@@ -2872,7 +2872,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry, setup =kmalloc (sizeof (*setup),GFP_KERNEL );if (! setup) { buffer->error = -ENOMEM ; -mutex_lock (&pstr->oss.setup_mutex); +mutex_unlock (&pstr->oss.setup_mutex);return ; }if (pstr->oss.setup_list ==NULL )
@@ -2886,7 +2886,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,if (! template.task_name) {kfree (setup); buffer->error = -ENOMEM ; -mutex_lock (&pstr->oss.setup_mutex); +mutex_unlock (&pstr->oss.setup_mutex);return ; } }
sound/core/sgbuf.c +4 -3
@@ -38,6 +38,10 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)if (! sgbuf)return -EINVAL ; +if (dmab->area) +vunmap (dmab->area); + dmab->area =NULL ; + tmpb.dev.type =SNDRV_DMA_TYPE_DEV ; tmpb.dev.dev = sgbuf->dev;for (i =0 ; i < sgbuf->pages; i++) {
@@ -48,9 +52,6 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab) tmpb.bytes = (sgbuf->table[i].addr & ~PAGE_MASK ) <<PAGE_SHIFT ;snd_dma_free_pages (&tmpb); } -if (dmab->area) -vunmap (dmab->area); - dmab->area =NULL ;kfree (sgbuf->table);kfree (sgbuf->page_table);
sound/isa/opl3sa2.c +12 -6
@@ -550,21 +550,27 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)#ifdef CONFIG_PM static int snd_opl3sa2_suspend (struct snd_card *card,pm_message_t state) { -struct snd_opl3sa2 *chip = card->private_data; +if (card) { +struct snd_opl3sa2 *chip = card->private_data; -snd_power_change_state (card, SNDRV_CTL_POWER_D3hot); - chip->wss->suspend (chip->wss); -/* power down */ -snd_opl3sa2_write (chip,OPL3SA2_PM_CTRL ,OPL3SA2_PM_D3 ); +snd_power_change_state (card, SNDRV_CTL_POWER_D3hot); + chip->wss->suspend (chip->wss); +/* power down */ +snd_opl3sa2_write (chip,OPL3SA2_PM_CTRL ,OPL3SA2_PM_D3 ); + }return 0 ; }static int snd_opl3sa2_resume (struct snd_card *card) { -struct snd_opl3sa2 *chip = card->private_data; +struct snd_opl3sa2 *chip;int i; +if (!card) +return 0 ; + + chip = card->private_data;/* power up */ snd_opl3sa2_write (chip,OPL3SA2_PM_CTRL ,OPL3SA2_PM_D0 );
sound/pci/hda/hda_intel.c +26 -13
@@ -2063,26 +2063,31 @@ static int __devinit check_position_fix(struct azx *chip, int fix) {const struct snd_pci_quirk *q; -/* Check VIA HD Audio Controller exist */ -if (chip->pci->vendor ==PCI_VENDOR_ID_VIA && - chip->pci->device ==VIA_HDAC_DEVICE_ID ) { +switch (fix) { +case POS_FIX_LPIB : +case POS_FIX_POSBUF : +return fix; + } + +/* Check VIA/ATI HD Audio Controller exist */ +switch (chip->driver_type) { +case AZX_DRIVER_VIA : +case AZX_DRIVER_ATI : chip->via_dmapos_patch =1 ;/* Use link position directly, avoid any transfer problem. */ return POS_FIX_LPIB ; } chip->via_dmapos_patch =0 ; -if (fix ==POS_FIX_AUTO ) { - q =snd_pci_quirk_lookup (chip->pci, position_fix_list); -if (q) { -printk (KERN_INFO -"hda_intel: position_fix set to %d " -"for device %04x:%04x\n" , - q->value, q->subvendor, q->subdevice); -return q->value; - } + q =snd_pci_quirk_lookup (chip->pci, position_fix_list); +if (q) { +printk (KERN_INFO +"hda_intel: position_fix set to %d " +"for device %04x:%04x\n" , + q->value, q->subvendor, q->subdevice); +return q->value; } -return fix; +return POS_FIX_AUTO ; }/*
@@ -2208,9 +2213,17 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, gcap =azx_readw (chip,GCAP );snd_printdd ("chipset global capabilities = 0x%x\n" , gcap); +/* ATI chips seems buggy about 64bit DMA addresses */ +if (chip->driver_type ==AZX_DRIVER_ATI ) + gcap &= ~0x01 ; +/* allow 64bit DMA address if supported by H/W */ if ((gcap &0x01 ) && !pci_set_dma_mask (pci,DMA_64BIT_MASK ))pci_set_consistent_dma_mask (pci,DMA_64BIT_MASK ); +else { +pci_set_dma_mask (pci,DMA_32BIT_MASK ); +pci_set_consistent_dma_mask (pci,DMA_32BIT_MASK ); + }/* read number of streams from GCAP register instead of using * hardcoded value
sound/pci/mixart/mixart.c +1 -0
@@ -607,6 +607,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,/* set the format to the board */ err =mixart_set_format (stream, format);if (err <0 ) { +mutex_unlock (&mgr->setup_mutex);return err; }
Re: Linux 2.6.28.9 (ocfs2 build errors)
In reply to Greg KHQuoted 5 lines · Greg KH
I'm announcing the release of the 2.6.28.9 kernel.
It contains a wide range of bugfixes, and all users of the 2.6.28 kernel series are strongly encouraged to upgrade.
Quoted 7 lines
I'll also be replying to this message with a copy of the patch between 2.6.28.8 and 2.6.28.9
The updated 2.6.28.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.28.y.git and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.28.y.git;a=summary
fs/ocfs2/journal.h:451: error: too many arguments to function 'jbd2_journal_begin_ordered_truncate'
(affects many fs/ocfs2/ source files)
Signature · 1 line
~Randy
Re: Linux 2.6.28.9 (ocfs2 build errors)
Quoted 15 lines · Randy Dunlap
Quoted 5 lines · Greg KH
I'm announcing the release of the 2.6.28.9 kernel.
It contains a wide range of bugfixes, and all users of the 2.6.28 kernel series are strongly encouraged to upgrade.
Quoted 7 lines
I'll also be replying to this message with a copy of the patch between 2.6.28.8 and 2.6.28.9
The updated 2.6.28.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.28.y.git and can be browsed at the normal kernel.org git web browser: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.28.y.git;a=summary
Quoted 3 lines
fs/ocfs2/journal.h:451: error: too many arguments to function 'jbd2_journal_begin_ordered_truncate'(affects many
fs/ocfs2/source files)
Yes, I didn't add Ted's patch yet, as he didn't send it in a form that I could take it in :(
thanks,
greg k-h