Linux 2.6.23.9
We (the -stable team) are announcing the release of the 2.6.23.9 kernel. It a number of bugfixes and anyone using the 2.6.23 kernel series is recommended to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.23.8 and 2.6.23.9
The updated 2.6.23.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.23.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.23.y.git;a=summarythanks,
greg k-h
--------
Makefile | 2 - arch/i386/lib/delay.c | 3 + arch/i386/mm/pgtable.c | 3 - arch/x86_64/kernel/entry.S | 2 - arch/x86_64/kernel/time.c | 11 ++----- arch/x86_64/lib/bitstr.c | 2 - arch/x86_64/lib/delay.c | 11 ++++--- arch/x86_64/mm/pageattr.c | 1 drivers/acpi/video.c | 13 +++++++- drivers/ata/sata_sis.c | 15 +++++---- drivers/crypto/geode-aes.c | 3 - drivers/dma/dmaengine.c | 17 +++-------- drivers/i2c/busses/i2c-pasemi.c | 5 +++ drivers/i2c/chips/eeprom.c | 37 +++++++++++++++--------- drivers/md/raid5.c | 16 +++++----- drivers/net/wireless/ipw2200.c | 56 ++++++++++++++++++++++++++++++------- drivers/net/wireless/ipw2200.h | 3 + drivers/oprofile/cpu_buffer.c | 7 ++++ drivers/oprofile/cpu_buffer.h | 1 drivers/oprofile/oprofile_stats.c | 4 ++ drivers/usb/storage/unusual_devs.h | 14 +++++++++ drivers/video/ps3fb.c | 2 - fs/nfsd/nfs2acl.c | 2 - fs/nfsd/nfs3acl.c | 2 - fs/nfsd/nfsfh.c | 43 +++++++++++++++++----------- fs/reiserfs/stree.c | 3 - include/asm-i386/system.h | 2 - include/asm-x86_64/system.h | 8 ++--- kernel/sched_fair.c | 2 - kernel/softlockup.c | 47 +++++++++++++++++++------------ kernel/time/ntp.c | 2 - lib/libcrc32c.c | 7 +--- 32 files changed, 227 insertions(+), 119 deletions(-)
Summary of changes from v2.6.23.8 to v2.6.23.9
==============================================
Alexey Starikovskiy (1):
ACPI: VIDEO: Adjust current level to closest available one.
Andrew Hastings (1):
x86: fix off-by-one in find_next_zero_string
Andrew Morton (1):
x86: disable preemption in delay_tsc()
Andrey Mirkin (1):
x86: return correct error code from child_rip in x86_64 entry.S
Chuck Ebbert (1):
Fix divide-by-zero in the 2.6.23 scheduler code
Dan Williams (2):
raid5: fix unending write sequence
ipw2200: batch non-user-requested scan result notifications
David P. Reed (2):
ntp: fix typo that makes sync_cmos_clock erratic
x86: fix freeze in x86_64 RTC update code in time_64.c
Fengguang Wu (1):
reiserfs: don't drop PG_dirty when releasing sub-page-sized dirty file
Greg Kroah-Hartman (1):
Linux 2.6.23.9
Haavard Skinnemoen (1):
dmaengine: fix broken device refcounting
Herbert Xu (1):
libcrc32c: keep intermediate crc state in cpu order
Huang, Ying (1):
x86: NX bit handling in change_page_attr()
Ingo Molnar (2):
softlockup watchdog fixes and cleanups
softlockup: use cpu_clock() instead of sched_clock()
J. Bruce Fields (2):
knfsd: fix spurious EINVAL errors on first access of new filesystem
nfsd4: recheck for secure ports in fh_verify
Jan Beulich (1):
i386: avoid temporarily inconsistent pte-s
Jean Delvare (3):
i2c-pasemi: Fix NACK detection
i2c/eeprom: Recognize VGN as a valid Sony Vaio name prefix i2c/eeprom: Hide Sony Vaio serial numbers
Jeff Garzik (1):
libata: sata_sis: use correct S/G table size
Kirill Korotaev (1):
x86: mark read_crX() asm code as volatile
Li Zefan (1):
drivers/video/ps3fb: fix memset size error
Ortwin Glück (1):
USB: Nikon D40X unusual_devs entry
Phil Dibowitz (1):
USB: unusual_devs modification for Nikon D200
Philippe Elie (1):
oProfile: oops when profile_pc() returns ~0LU
Sebastian Siewior (1):
geode: Fix not inplace encryption
Tejun Heo (1):
sata_sis: fix SCR read breakage
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 23 -EXTRAVERSION = .8 +EXTRAVERSION = .9 NAME = Arr Matey! A Hairy Bilge Rat! # *DOCUMENTATION*
arch/i386/lib/delay.c +3 -0
@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/sched.h> +#include <linux/preempt.h> #include <linux/delay.h> #include <asm/processor.h>
@@ -42,11 +43,13 @@ static void delay_tsc(unsigned long loops) {unsigned long bclock, now; +preempt_disable ();/* TSC's are per-cpu */ rdtscl (bclock);do {rep_nop ();rdtscl (now); }while ((now-bclock) < loops); +preempt_enable (); }/*
arch/i386/mm/pgtable.c +1 -2
@@ -97,8 +97,7 @@ static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags) } pte =pte_offset_kernel (pmd, vaddr);if (pgprot_val (flags)) -/* <pfn,flags> stored as-is, to permit clearing entries */ -set_pte (pte,pfn_pte (pfn, flags)); +set_pte_present (&init_mm, vaddr, pte,pfn_pte (pfn, flags));else pte_clear (&init_mm, vaddr, pte);
arch/x86_64/kernel/entry.S +1 -1
@@ -989,7 +989,7 @@ child_rip: movq %rsi, %rdi call *%rax # exit - xorl %edi, %edi + mov %eax, %edi call do_exit CFI_ENDPROC ENDPROC(child_rip)
arch/x86_64/kernel/time.c +4 -7
@@ -87,18 +87,15 @@ static int set_rtc_mmss(unsigned long nowtime)int retval =0 ;int real_seconds, real_minutes, cmos_minutes;unsigned char control, freq_select; +unsigned long flags;/* -* IRQs are disabled when we're called from the timer interrupt, -* no need for spin_lock_irqsave() +* set_rtc_mmss is called when irqs are enabled, so disable irqs here */ - -spin_lock (&rtc_lock); - +spin_lock_irqsave (&rtc_lock, flags);/* * Tell the clock it's being set and stop it. */ - control =CMOS_READ (RTC_CONTROL );CMOS_WRITE (control |RTC_SET ,RTC_CONTROL );
@@ -143,7 +140,7 @@ static int set_rtc_mmss(unsigned long nowtime)CMOS_WRITE (control,RTC_CONTROL );CMOS_WRITE (freq_select,RTC_FREQ_SELECT ); -spin_unlock (&rtc_lock); +spin_unlock_irqrestore (&rtc_lock, flags);return retval; }
arch/x86_64/lib/bitstr.c +1 -1
@@ -14,7 +14,7 @@ find_next_zero_string(unsigned long *bitmap, long start, long nbits, int len)/* could test bitsliced, but it's hardly worth it */ end = n+len; -if (end >= nbits) +if (end > nbits)return -1 ;for (i = n+1 ; i < end; i++) {if (test_bit (i, bitmap)) {
arch/x86_64/lib/delay.c +7 -4
@@ -10,7 +10,9 @@#include <linux/module.h> #include <linux/sched.h> +#include <linux/preempt.h> #include <linux/delay.h> +#include <asm/delay.h> #include <asm/msr.h>
@@ -27,14 +29,15 @@ int read_current_timer(unsigned long *timer_value)void __delay (unsigned long loops) {unsigned bclock, now; - + +preempt_disable ();/* TSC's are pre-cpu */ rdtscl (bclock); -do - { +do {rep_nop ();rdtscl (now); } -while ((now-bclock) < loops); +while ((now-bclock) < loops); +preempt_enable (); }EXPORT_SYMBOL (__delay);
arch/x86_64/mm/pageattr.c +1 -0
@@ -148,6 +148,7 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot, split =split_large_page (address, prot, ref_prot2);if (!split)return -ENOMEM ; +pgprot_val (ref_prot2) &= ~_PAGE_NX;set_pte (kpte,mk_pte (split, ref_prot2)); kpte_page = split; }
drivers/acpi/video.c +12 -1
@@ -1633,9 +1633,20 @@ static int acpi_video_get_next_level(struct acpi_video_device *device, u32 level_current, u32 event) { - int min, max, min_above, max_below, i, l; + int min, max, min_above, max_below, i, l, delta = 255; max = max_below =0 ; min = min_above =255 ; +/* Find closest level to level_current */ +for (i =0 ; i < device->brightness->count; i++) { + l = device->brightness->levels[i]; +if (abs (l - level_current) <abs (delta)) { + delta = l - level_current; +if (!delta) +break ; + } + } +/* Ajust level_current to closest available level */ + level_current += delta;for (i =0 ; i < device->brightness->count; i++) { l = device->brightness->levels[i];if (l < min)
drivers/ata/sata_sis.c +9 -6
@@ -92,7 +92,7 @@ static struct scsi_host_template sis_sht = { .queuecommand = ata_scsi_queuecmd, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, - .sg_tablesize = ATA_MAX_PRD, + .sg_tablesize = LIBATA_MAX_PRD, .cmd_per_lun = ATA_SHT_CMD_PER_LUN, .emulated = ATA_SHT_EMULATED, .use_clustering = ATA_SHT_USE_CLUSTERING,
@@ -168,11 +168,11 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)return addr; } -static u32 sis_scr_cfg_read (struct ata_port *ap,unsigned int sc_reg) +static u32 sis_scr_cfg_read (struct ata_port *ap,unsigned int sc_reg,u32 *val) {struct pci_dev *pdev =to_pci_dev (ap->host->dev);unsigned int cfg_addr =get_scr_cfg_addr (ap, sc_reg); -u32 val, val2 =0 ; +u32 val2 =0 ;u8 pmr;if (sc_reg ==SCR_ERROR )/* doesn't exist in PCI cfg space */
@@ -180,13 +180,16 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)pci_read_config_byte (pdev,SIS_PMR , &pmr); -pci_read_config_dword (pdev, cfg_addr, &val); +pci_read_config_dword (pdev, cfg_addr, val);if ((pdev->device ==0x0182 ) || (pdev->device ==0x0183 ) || (pdev->device ==0x1182 ) || (pmr &SIS_PMR_COMBINED ))pci_read_config_dword (pdev, cfg_addr+0x10 , &val2); -return (val|val2) &0xfffffffb ;/* avoid problems with powerdowned ports */ + *val |= val2; + *val &=0xfffffffb ;/* avoid problems with powerdowned ports */ + +return 0 ; }static void sis_scr_cfg_write (struct ata_port *ap,unsigned int sc_reg,u32 val)
@@ -216,7 +219,7 @@ static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)return -EINVAL ;if (ap->flags &SIS_FLAG_CFGSCR ) -return sis_scr_cfg_read (ap, sc_reg); +return sis_scr_cfg_read (ap, sc_reg, val);pci_read_config_byte (pdev,SIS_PMR , &pmr);
drivers/crypto/geode-aes.c +1 -2
@@ -110,8 +110,7 @@ geode_aes_crypt(struct geode_aes_op *op)* we don't need to worry */ -if (op->src == op->dst) - flags |= (AES_CTRL_DCA |AES_CTRL_SCA ); + flags |= (AES_CTRL_DCA |AES_CTRL_SCA );if (op->dir ==AES_DIR_ENCRYPT ) flags |=AES_CTRL_ENCRYPT ;
drivers/dma/dmaengine.c +6 -11
@@ -182,10 +182,9 @@ static void dma_client_chan_alloc(struct dma_client *client)/* we are done once this client rejects * an available resource */ -if (ack ==DMA_ACK ) { +if (ack ==DMA_ACK )dma_chan_get (chan); -kref_get (&device->refcount); - }else if (ack ==DMA_NAK ) +else if (ack ==DMA_NAK )return ; } }
@@ -272,11 +271,8 @@ static void dma_clients_notify_removed(struct dma_chan *chan)/* client was holding resources for this channel so * free it */ -if (ack ==DMA_ACK ) { +if (ack ==DMA_ACK )dma_chan_put (chan); -kref_put (&chan->device->refcount, - dma_async_device_cleanup); - } }mutex_unlock (&dma_list_mutex);
@@ -316,11 +312,8 @@ void dma_async_client_unregister(struct dma_client *client) ack = client->event_callback (client, chan,DMA_RESOURCE_REMOVED ); -if (ack ==DMA_ACK ) { +if (ack ==DMA_ACK )dma_chan_put (chan); -kref_put (&chan->device->refcount, - dma_async_device_cleanup); - } }list_del (&client->global_node);
@@ -397,6 +390,8 @@ int dma_async_device_register(struct dma_device *device) goto err_out; } +/* One for the channel, one of the class device */ +kref_get (&device->refcount);kref_get (&device->refcount);kref_init (&chan->refcount); chan->slow_ref =0 ;
drivers/i2c/busses/i2c-pasemi.c +5 -0
@@ -51,6 +51,7 @@ struct pasemi_smbus {#define MRXFIFO_DATA_M 0x000000ff#define SMSTA_XEN 0x08000000 +#define SMSTA_MTN 0x00200000#define CTL_MRR 0x00000400#define CTL_MTR 0x00000200
@@ -98,6 +99,10 @@ static unsigned int pasemi_smb_waitready(struct pasemi_smbus *smbus) status =reg_read (smbus,REG_SMSTA ); } +/* Got NACK? */ +if (status &SMSTA_MTN ) +return -ENXIO ; +if (timeout <0 ) {dev_warn (&smbus->dev->dev,"Timeout, status 0x%08x\n" , status);reg_write (smbus,REG_SMSTA , status);
drivers/i2c/chips/eeprom.c +24 -13
@@ -128,13 +128,20 @@ static ssize_t eeprom_read(struct kobject *kobj, struct bin_attribute *bin_attr,for (slice = off >>5 ; slice <= (off + count -1 ) >>5 ; slice++)eeprom_update_client (client, slice); -/* Hide Vaio security settings to regular users (16 first bytes) */ -if (data->nature ==VAIO && off <16 && !capable (CAP_SYS_ADMIN )) { -size_t in_row1 =16 - off; - in_row1 =min (in_row1, count); -memset (buf,0 , in_row1); -if (count - in_row1 >0 ) -memcpy (buf + in_row1, &data->data[16 ], count - in_row1); +/* Hide Vaio private settings to regular users: +- BIOS passwords: bytes 0x00 to 0x0f +- UUID: bytes 0x10 to 0x1f +- Serial number: 0xc0 to 0xdf */ +if (data->nature ==VAIO && !capable (CAP_SYS_ADMIN )) { +int i; + +for (i =0 ; i < count; i++) { +if ((off + i <=0x1f ) || + (off + i >=0xc0 && off + i <=0xdf )) + buf[i] =0 ; +else + buf[i] = data->data[off + i]; + } }else {memcpy (buf, &data->data[off], count); }
@@ -197,14 +204,18 @@ static int eeprom_detect(struct i2c_adapter *adapter, int address, int kind) goto exit_kfree;/* Detect the Vaio nature of EEPROMs. -We use the "PCG-" prefix as the signature. */ +We use the "PCG-" or "VGN-" prefix as the signature. */ if (address ==0x57 ) { -if (i2c_smbus_read_byte_data (new_client,0x80 ) =='P' - &&i2c_smbus_read_byte (new_client) =='C' - &&i2c_smbus_read_byte (new_client) =='G' - &&i2c_smbus_read_byte (new_client) =='-' ) { +char name[4 ]; + + name[0 ] =i2c_smbus_read_byte_data (new_client,0x80 ); + name[1 ] =i2c_smbus_read_byte (new_client); + name[2 ] =i2c_smbus_read_byte (new_client); + name[3 ] =i2c_smbus_read_byte (new_client); + +if (!memcmp (name,"PCG-" ,4 ) || !memcmp (name,"VGN-" ,4 )) {dev_info (&new_client->dev,"Vaio EEPROM detected, " -"enabling password protection\n" ); +"enabling privacy protection\n" ); data->nature =VAIO ; } }
drivers/md/raid5.c +9 -7
@@ -689,7 +689,8 @@ ops_run_prexor(struct stripe_head *sh, struct dma_async_tx_descriptor *tx) }static struct dma_async_tx_descriptor * -ops_run_biodrain (struct stripe_head *sh,struct dma_async_tx_descriptor *tx) +ops_run_biodrain (struct stripe_head *sh,struct dma_async_tx_descriptor *tx, +unsigned long pending) {int disks = sh->disks;int pd_idx = sh->pd_idx, i;
@@ -697,7 +698,7 @@ ops_run_biodrain(struct stripe_head *sh, struct dma_async_tx_descriptor *tx)/* check if prexor is active which means only process blocks * that are part of a read-modify-write (Wantprexor) */ -int prexor =test_bit (STRIPE_OP_PREXOR , &sh->ops.pending); +int prexor =test_bit (STRIPE_OP_PREXOR , &pending);pr_debug ("%s: stripe %llu\n" , __FUNCTION__, (unsigned long long )sh->sector);
@@ -774,7 +775,8 @@ static void ops_complete_write(void *stripe_head_ref) }static void -ops_run_postxor (struct stripe_head *sh,struct dma_async_tx_descriptor *tx) +ops_run_postxor (struct stripe_head *sh,struct dma_async_tx_descriptor *tx, +unsigned long pending) {/* kernel stack size limits the total number of disks */ int disks = sh->disks;
@@ -782,7 +784,7 @@ ops_run_postxor(struct stripe_head *sh, struct dma_async_tx_descriptor *tx)int count =0 , pd_idx = sh->pd_idx, i;struct page *xor_dest; -int prexor =test_bit (STRIPE_OP_PREXOR , &sh->ops.pending); +int prexor =test_bit (STRIPE_OP_PREXOR , &pending);unsigned long flags;dma_async_tx_callback callback;
@@ -809,7 +811,7 @@ ops_run_postxor(struct stripe_head *sh, struct dma_async_tx_descriptor *tx) }/* check whether this postxor is part of a write */ - callback =test_bit (STRIPE_OP_BIODRAIN , &sh->ops.pending) ? + callback =test_bit (STRIPE_OP_BIODRAIN , &pending) ? ops_complete_write : ops_complete_postxor;/* 1/ if we prexor'd then the dest is reused as a source
@@ -897,12 +899,12 @@ static void raid5_run_ops(struct stripe_head *sh, unsigned long pending) tx =ops_run_prexor (sh, tx);if (test_bit (STRIPE_OP_BIODRAIN , &pending)) { - tx =ops_run_biodrain (sh, tx); + tx =ops_run_biodrain (sh, tx, pending); overlap_clear++; }if (test_bit (STRIPE_OP_POSTXOR , &pending)) -ops_run_postxor (sh, tx); +ops_run_postxor (sh, tx, pending);if (test_bit (STRIPE_OP_CHECK , &pending))ops_run_check (sh);
drivers/net/wireless/ipw2200.c +46 -10
111 lines not on this page · raw message
drivers/net/wireless/ipw2200.h +3 -0
@@ -1288,6 +1288,8 @@ struct ipw_priv {struct iw_public_data wireless_data; +int user_requested_scan; +struct workqueue_struct *workqueue;struct delayed_work adhoc_check;
@@ -1296,6 +1298,7 @@ struct ipw_priv {struct work_struct system_config;struct work_struct rx_replenish;struct delayed_work request_scan; +struct delayed_work scan_event;struct work_struct request_passive_scan;struct work_struct adapter_restart;struct delayed_work rf_kill;
drivers/oprofile/cpu_buffer.c +7 -0
@@ -64,6 +64,8 @@ int alloc_cpu_buffers(void) b->head_pos =0 ; b->sample_received =0 ; b->sample_lost_overflow =0 ; + b->backtrace_aborted =0 ; + b->sample_invalid_eip =0 ; b->cpu = i;INIT_DELAYED_WORK (&b->work, wq_sync_buffer); }
@@ -175,6 +177,11 @@ static int log_sample(struct oprofile_cpu_buffer * cpu_buf, unsigned long pc, cpu_buf->sample_received++; +if (pc ==ESCAPE_CODE ) { + cpu_buf->sample_invalid_eip++; +return 0 ; + } +if (nr_available_slots (cpu_buf) <3 ) { cpu_buf->sample_lost_overflow++;return 0 ;
drivers/oprofile/cpu_buffer.h +1 -0
@@ -42,6 +42,7 @@ struct oprofile_cpu_buffer {unsigned long sample_received;unsigned long sample_lost_overflow;unsigned long backtrace_aborted; +unsigned long sample_invalid_eip;int cpu;struct delayed_work work; }____cacheline_aligned ;
drivers/oprofile/oprofile_stats.c +4 -0
@@ -26,6 +26,8 @@ void oprofile_reset_stats(void) cpu_buf = &cpu_buffer[i]; cpu_buf->sample_received =0 ; cpu_buf->sample_lost_overflow =0 ; + cpu_buf->backtrace_aborted =0 ; + cpu_buf->sample_invalid_eip =0 ; }atomic_set (&oprofile_stats.sample_lost_no_mm,0 );
@@ -61,6 +63,8 @@ void oprofile_create_stats_files(struct super_block * sb, struct dentry * root) &cpu_buf->sample_lost_overflow);oprofilefs_create_ro_ulong (sb, cpudir,"backtrace_aborted" , &cpu_buf->backtrace_aborted); +oprofilefs_create_ro_ulong (sb, cpudir,"sample_invalid_eip" , + &cpu_buf->sample_invalid_eip); } oprofilefs_create_ro_atomic(sb, dir, "sample_lost_no_mm",
drivers/usb/storage/unusual_devs.h +14 -0
@@ -341,6 +341,13 @@ UNUSUAL_DEV( 0x04b0, 0x040d, 0x0100, 0x0100, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), +/* Reported by Graber and Mike Pagano <[email protected]> */ +UNUSUAL_DEV (0x04b0 ,0x040f ,0x0200 ,0x0200 , +"NIKON" , +"NIKON DSC D200" , +US_SC_DEVICE ,US_PR_DEVICE ,NULL , +US_FL_FIX_CAPACITY ), +/* Reported by Emil Larsson <[email protected]> */ UNUSUAL_DEV( 0x04b0, 0x0411, 0x0100, 0x0101, "NIKON",
@@ -355,6 +362,13 @@ UNUSUAL_DEV( 0x04b0, 0x0413, 0x0110, 0x0110, US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_CAPACITY), +/* Reported by Shan Destromp ([email protected]) */ +UNUSUAL_DEV (0x04b0 ,0x0417 ,0x0100 ,0x0100 , +"NIKON" , +"NIKON DSC D40X" , +US_SC_DEVICE ,US_PR_DEVICE ,NULL , + US_FL_FIX_CAPACITY), +/* BENQ DC5330 * Reported by Manuel Fombuena <[email protected]> and * Frank Copeland <[email protected]> */
drivers/video/ps3fb.c +1 -1
@@ -659,7 +659,7 @@ static int ps3fb_blank(int blank, struct fb_info *info)static int ps3fb_get_vblank (struct fb_vblank *vblank) { -memset (vblank,0 ,sizeof (&vblank)); +memset (vblank,0 ,sizeof (*vblank)); vblank->flags =FB_VBLANK_HAVE_VSYNC ;return 0 ; }
fs/nfsd/nfs2acl.c +1 -1
@@ -41,7 +41,7 @@ static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, fh =fh_copy (&resp->fh, &argp->fh);if ((nfserr =fh_verify (rqstp, &resp->fh,0 ,MAY_NOP ))) -RETURN_STATUS (nfserr_inval); +RETURN_STATUS (nfserr);if (argp->mask & ~(NFS_ACL |NFS_ACLCNT |NFS_DFACL |NFS_DFACLCNT ))RETURN_STATUS (nfserr_inval);
fs/nfsd/nfs3acl.c +1 -1
@@ -37,7 +37,7 @@ static __be32 nfsd3_proc_getacl(struct svc_rqst * rqstp, fh =fh_copy (&resp->fh, &argp->fh);if ((nfserr =fh_verify (rqstp, &resp->fh,0 ,MAY_NOP ))) -RETURN_STATUS (nfserr_inval); +RETURN_STATUS (nfserr);if (argp->mask & ~(NFS_ACL |NFS_ACLCNT |NFS_DFACL |NFS_DFACLCNT ))RETURN_STATUS (nfserr_inval);
fs/nfsd/nfsfh.c +26 -17
68 lines not on this page · raw message
fs/reiserfs/stree.c +0 -3
@@ -1458,9 +1458,6 @@ static void unmap_buffers(struct page *page, loff_t pos) } bh = next; }while (bh != head); -if (PAGE_SIZE == bh->b_size) { -cancel_dirty_page (page,PAGE_CACHE_SIZE ); - } } } }
include/asm-i386/system.h +1 -1
@@ -141,7 +141,7 @@ static inline unsigned long native_read_cr4_safe(void) {unsigned long val;/* This could fault if %cr4 does not exist */ - asm("1: movl %%cr4, %0 \n" + asmvolatile ("1: movl %%cr4, %0 \n" "2: \n" ".section __ex_table,\"a\" \n" ".long 1b,2b \n"
include/asm-x86_64/system.h +4 -4
@@ -85,7 +85,7 @@ static inline void write_cr0(unsigned long val)static inline unsigned long read_cr2 (void ) {unsigned long cr2; - asm("movq %%cr2,%0" :"=r" (cr2)); + asmvolatile ("movq %%cr2,%0" :"=r" (cr2));return cr2; }
@@ -97,7 +97,7 @@ static inline void write_cr2(unsigned long val)static inline unsigned long read_cr3 (void ) {unsigned long cr3; - asm("movq %%cr3,%0" :"=r" (cr3)); + asmvolatile ("movq %%cr3,%0" :"=r" (cr3));return cr3; }
@@ -109,7 +109,7 @@ static inline void write_cr3(unsigned long val)static inline unsigned long read_cr4 (void ) {unsigned long cr4; - asm("movq %%cr4,%0" :"=r" (cr4)); + asmvolatile ("movq %%cr4,%0" :"=r" (cr4));return cr4; }
@@ -121,7 +121,7 @@ static inline void write_cr4(unsigned long val)static inline unsigned long read_cr8 (void ) {unsigned long cr8; - asm("movq %%cr8,%0" :"=r" (cr8)); + asmvolatile ("movq %%cr8,%0" :"=r" (cr8));return cr8; }
kernel/sched_fair.c +1 -1
@@ -93,7 +93,7 @@ unsigned int sysctl_sched_features __read_mostly =SCHED_FEAT_FAIR_SLEEPERS *1 |SCHED_FEAT_SLEEPER_AVG *0 |SCHED_FEAT_SLEEPER_LOAD_AVG *1 | -SCHED_FEAT_PRECISE_CPU_LOAD *1 | +SCHED_FEAT_PRECISE_CPU_LOAD *0 |SCHED_FEAT_START_DEBIT *1 |SCHED_FEAT_SKIP_INITIAL *0 ;
kernel/softlockup.c +29 -18
110 lines not on this page · raw message
kernel/time/ntp.c +1 -1
@@ -205,7 +205,7 @@ static void sync_cmos_clock(unsigned long dummy)return ;getnstimeofday (&now); -if (abs (xtime.tv_nsec - (NSEC_PER_SEC /2 )) <= tick_nsec /2 ) +if (abs (now.tv_nsec - (NSEC_PER_SEC /2 )) <= tick_nsec /2 ) fail =update_persistent_clock (now); next.tv_nsec = (NSEC_PER_SEC /2 ) - now.tv_nsec;
lib/libcrc32c.c +2 -5
@@ -33,7 +33,6 @@#include <linux/crc32c.h> #include <linux/compiler.h> #include <linux/module.h> -#include <asm/byteorder.h> MODULE_AUTHOR ("Clay Haapala <[email protected]>" );MODULE_DESCRIPTION ("CRC32c (Castagnoli) calculations" );
@@ -161,15 +160,13 @@ static const u32 crc32c_table[256] = {*/ u32 __attribute_pure__ -crc32c_le (u32 seed,unsigned char const *data,size_t length) +crc32c_le (u32 crc,unsigned char const *data,size_t length) { -u32 crc =__cpu_to_le32 (seed); -while (length--) crc = crc32c_table[(crc ^ *data++) &0xFFL ] ^ (crc >>8 ); -return __le32_to_cpu (crc); +return crc; }#endif /* CRC_LE_BITS == 8 */
On Mon, 26 Nov 2007, Greg Kroah-Hartman wrote:
[..]
Still there is no aroud officialy released iptables tarball with support for rules for new xt_{connlimit,time,u32} modules. Anyone know where are patches for manage connlimit, time, u32 rules which will be included in next release ?
kloczek
Signature · 4 lines
----------------------------------------------------------- *Ludzie nie maj� problem�w, tylko sobie sami je stwarzaj�* ----------------------------------------------------------- Tomasz K�oczko | *e-mail: [email protected]*
Quoted 5 lines · Tomasz K
On Mon, 26 Nov 2007, Greg Kroah-Hartman wrote:
[..]Still there is no aroud officialy released iptables tarball with support for rules for new xt_{connlimit,time,u32} modules. Anyone know where are patches for manage connlimit, time, u32 rules which will be included in next release ?
A well chosen thread to ask this question. xt_time is not even included in 2.6.23.
Quoted 9 lines · Patrick McHardy
Quoted 7 lines · Tomasz K
On Mon, 26 Nov 2007, Greg Kroah-Hartman wrote:
[..]Still there is no aroud officialy released iptables tarball with support for rules for new xt_{connlimit,time,u32} modules. Anyone know where are patches for manage connlimit, time, u32 rules which will be included in next release ?
Quoted 4 lines
A well chosen thread to ask this question.
xt_timeis not even included in 2.6.23.
And I don't see any mention of connlimit, time, or u32 in the Changelog for that...
I admit I haven't peeked inside the actual tarball to see if they added stuff and didn't Changelog it...