Linux 2.6.12.3
Subsystems (14)
We (the -stable team) are announcing the release of the 2.6.12.3 kernel.
The diffstat and short summary of the fixes are below.
I'll also be replying to this message with a copy of the patch between 2.6.12.2 and 2.6.12.3, as it is small enough to do so.
The updated 2.6.12.y git tree can be found at:
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/linux-2.6.12.y.git
and can be browsed at the normal kernel.org git web browser:
www.kernel.org/git/
thanks,
greg k-h
----------
Makefile | 2 arch/ppc/kernel/time.c | 13 ++-- arch/um/kernel/process.c | 48 ++++++++++------- drivers/acpi/pci_irq.c | 2 drivers/char/tpm/tpm.c | 76 --------------------------- drivers/char/tpm/tpm.h | 2 drivers/char/tpm/tpm_atmel.c | 16 +++-- drivers/char/tpm/tpm_nsc.c | 16 +++-- drivers/char/tty_ioctl.c | 4 - drivers/media/video/cx88/cx88-video.c | 2 drivers/net/hamradio/Kconfig | 2 drivers/net/shaper.c | 40 +++++--------- fs/char_dev.c | 2 include/linux/if_shaper.h | 2 net/ipv4/ip_output.c | 3 - net/ipv4/netfilter/ip_conntrack_standalone.c | 7 ++ net/packet/af_packet.c | 6 ++ 17 files changed, 93 insertions(+), 150 deletions(-)
Summary of changes from v2.6.12.2 to v2.6.12.3
==============================================
Alexander Nyberg:
If ACPI doesn't find an irq listed, don't accept 0 as a valid PCI irq.
David S. Miller:
fix Shaper driver lossage in 2.6.12
Greg Kroah-Hartman:
Linux 2.6.12.3
john stultz:
ppc32: stop misusing ntps time_offset value
KAMBAROV, ZAUR:
coverity: tty_ldisc_ref return null check
Kylene Jo Hall:
tpm breaks 8139cp
Michael Krufky:
v4l cx88 hue offset fix
Paolo 'Blaisorblade' Giarrusso:
uml: fix TT mode by reverting "use fork instead of clone"
Patrick McHardy:
revert nf_reset change
Ralf Baechle:
SMP fix for 6pack driver
Wen-chien Jesse Sung:
fix semaphore handling in __unregister_chrdev_region
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 12 -EXTRAVERSION = .2 +EXTRAVERSION = .3 NAME=Woozy Numbat # *DOCUMENTATION*
arch/ppc/kernel/time.c +8 -5
@@ -89,6 +89,9 @@ unsigned long tb_to_ns_scale;extern unsigned long wall_jiffies; +/* used for timezone offset */ +static long timezone_offset; +DEFINE_SPINLOCK (rtc_lock);EXPORT_SYMBOL (rtc_lock);
@@ -170,7 +173,7 @@ void timer_interrupt(struct pt_regs * re xtime.tv_sec - last_rtc_update >=659 &&abs ((xtime.tv_nsec /1000 ) - (1000000 -1000000 /HZ )) <500000 /HZ && jiffies - wall_jiffies == 1) { - if (ppc_md.set_rtc_time(xtime.tv_sec+1 + time_offset) == 0) + if (ppc_md.set_rtc_time(xtime.tv_sec+1 + timezone_offset) == 0) last_rtc_update = xtime.tv_sec+1 ; else/* Try again one minute later */
@@ -286,7 +289,7 @@ void __init time_init(void)unsigned old_stamp, stamp, elapsed;if (ppc_md.time_init !=NULL ) - time_offset = ppc_md.time_init (); + timezone_offset = ppc_md.time_init ();if (__USE_RTC ()) {/* 601 processor: dec counts down by 128 every 128ns */
@@ -331,10 +334,10 @@ void __init time_init(void)set_dec (tb_ticks_per_jiffy);/* If platform provided a timezone (pmac), we correct the time */ -if (time_offset) { - sys_tz.tz_minuteswest = -time_offset /60 ; +if (timezone_offset) { + sys_tz.tz_minuteswest = -timezone_offset /60 ; sys_tz.tz_dsttime =0 ; - xtime.tv_sec -= time_offset; + xtime.tv_sec -= timezone_offset; }set_normalized_timespec (&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
arch/um/kernel/process.c +29 -19
156 lines not on this page · raw message
drivers/acpi/pci_irq.c +1 -1
@@ -433,7 +433,7 @@ acpi_pci_irq_enable ( printk(KERN_WARNING PREFIX "PCI Interrupt %s[%c]: no GSI", pci_name(dev), ('A' + pin));/* Interrupt Line values above 0xF are forbidden */ -if (dev->irq >=0 && (dev->irq <=0xF )) { +if (dev->irq >0 && (dev->irq <=0xF )) {printk (" - using IRQ %d\n" , dev->irq);acpi_register_gsi (dev->irq,ACPI_LEVEL_SENSITIVE ,ACPI_ACTIVE_LOW );return_VALUE (0 );
drivers/char/tpm/tpm.c +0 -76
94 lines not on this page · raw message
drivers/char/tpm/tpm.h +0 -2
@@ -79,8 +79,6 @@ static inline void tpm_write_index(int i }extern void tpm_time_expired (unsigned long ); -extern int tpm_lpc_bus_init (struct pci_dev *,u16 ); -extern int tpm_register_hardware (struct pci_dev *,struct tpm_vendor_specific *);extern int tpm_open (struct inode *,struct file *);
drivers/char/tpm/tpm_atmel.c +10 -6
@@ -22,7 +22,10 @@#include "tpm.h" /* Atmel definitions */ -#define TPM_ATML_BASE 0x400 +enum tpm_atmel_addr { +TPM_ATMEL_BASE_ADDR_LO =0x08 , +TPM_ATMEL_BASE_ADDR_HI =0x09 +};/* write status bits */ #define ATML_STATUS_ABORT 0x01
@@ -127,7 +130,6 @@ static struct tpm_vendor_specific tpm_at .cancel = tpm_atml_cancel, .req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL, .req_complete_val = ATML_STATUS_DATA_AVAIL, - .base = TPM_ATML_BASE, .miscdev = { .fops = &atmel_ops, }, };
@@ -136,14 +138,16 @@ static int __devinit tpm_atml_init(struc {u8 version[4 ];int rc =0 ; +int lo, hi;if (pci_enable_device (pci_dev))return -EIO ; -if (tpm_lpc_bus_init (pci_dev,TPM_ATML_BASE )) { - rc = -ENODEV ; - goto out_err; - } + lo =tpm_read_index (TPM_ATMEL_BASE_ADDR_LO ); + hi =tpm_read_index (TPM_ATMEL_BASE_ADDR_HI ); + + tpm_atmel.base = (hi<<8 )|lo; +dev_dbg ( &pci_dev->dev,"Operating with base: 0x%x\n" , tpm_atmel.base);/* verify that it is an Atmel part */ if (tpm_read_index(4) != 'A' || tpm_read_index(5) != 'T'
drivers/char/tpm/tpm_nsc.c +10 -6
@@ -24,6 +24,10 @@/* National definitions */ #define TPM_NSC_BASE 0x360#define TPM_NSC_IRQ 0x07 +#define TPM_NSC_BASE0_HI 0x60 +#define TPM_NSC_BASE0_LO 0x61 +#define TPM_NSC_BASE1_HI 0x62 +#define TPM_NSC_BASE1_LO 0x63#define NSC_LDN_INDEX 0x07#define NSC_SID_INDEX 0x20
@@ -234,7 +238,6 @@ static struct tpm_vendor_specific tpm_ns .cancel = tpm_nsc_cancel, .req_complete_mask = NSC_STATUS_OBF, .req_complete_val = NSC_STATUS_OBF, - .base = TPM_NSC_BASE, .miscdev = { .fops = &nsc_ops, }, };
@@ -243,15 +246,16 @@ static int __devinit tpm_nsc_init(struct const struct pci_device_id *pci_id) {int rc =0 ; +int lo, hi; + + hi =tpm_read_index (TPM_NSC_BASE0_HI ); + lo =tpm_read_index (TPM_NSC_BASE0_LO ); + + tpm_nsc.base = (hi<<8 ) | lo;if (pci_enable_device (pci_dev))return -EIO ; -if (tpm_lpc_bus_init (pci_dev,TPM_NSC_BASE )) { - rc = -ENODEV ; - goto out_err; - } -/* verify that it is a National part (SID) */ if (tpm_read_index (NSC_SID_INDEX ) !=0xEF ) { rc = -ENODEV ;
drivers/char/tty_ioctl.c +2 -2
@@ -476,11 +476,11 @@ int n_tty_ioctl(struct tty_struct * tty, ld =tty_ldisc_ref (tty);switch (arg) {case TCIFLUSH : -if (ld->flush_buffer) +if (ld && ld->flush_buffer) ld->flush_buffer (tty);break ;case TCIOFLUSH : -if (ld->flush_buffer) +if (ld && ld->flush_buffer) ld->flush_buffer (tty);/* fall through */ case TCOFLUSH :
drivers/media/video/cx88/cx88-video.c +1 -1
@@ -261,7 +261,7 @@ static struct cx88_ctrl cx8800_ctls[] = .default_value = 0, .type = V4L2_CTRL_TYPE_INTEGER, }, - .off = 0, + .off = 128, .reg = MO_HUE, .mask = 0x00ff, .shift = 0,
drivers/net/hamradio/Kconfig +1 -1
@@ -17,7 +17,7 @@ config MKISS config 6PACK tristate "Serial port 6PACK driver" - depends on AX25 && BROKEN_ON_SMP + depends on AX25 ---help--- 6pack is a transmission protocol for the data exchange between your PC and your TNC (the Terminal Node Controller acts as a kind of
drivers/net/shaper.c +15 -25
@@ -135,10 +135,8 @@ static int shaper_start_xmit(struct sk_b {struct shaper *shaper = dev->priv;struct sk_buff *ptr; - -if (down_trylock (&shaper->sem)) -return -1 ; +spin_lock (&shaper->lock); ptr=shaper->sendq.prev;/*
@@ -232,7 +230,7 @@ static int shaper_start_xmit(struct sk_b shaper->stats.collisions++; }shaper_kick (shaper); -up (&shaper->sem); +spin_unlock (&shaper->lock);return 0 ; }
@@ -271,11 +269,9 @@ static void shaper_timer(unsigned long d {struct shaper *shaper = (struct shaper *)data; -if (!down_trylock (&shaper->sem)) { -shaper_kick (shaper); -up (&shaper->sem); - }else -mod_timer (&shaper->timer, jiffies); +spin_lock (&shaper->lock); +shaper_kick (shaper); +spin_unlock (&shaper->lock); }/*
@@ -332,21 +328,6 @@ static void shaper_kick(struct shaper *s/* -* Flush the shaper queues on a closedown -*/ - -static void shaper_flush (struct shaper *shaper) -{ -struct sk_buff *skb; - -down (&shaper->sem); -while ((skb=skb_dequeue (&shaper->sendq))!=NULL ) -dev_kfree_skb (skb); -shaper_kick (shaper); -up (&shaper->sem); -} - -/* * Bring the interface up. We just disallow this until a * bind. */
@@ -375,7 +356,15 @@ static int shaper_open(struct net_devicestatic int shaper_close (struct net_device *dev) {struct shaper *shaper=dev->priv; -shaper_flush (shaper); +struct sk_buff *skb; + +while ((skb =skb_dequeue (&shaper->sendq)) !=NULL ) +dev_kfree_skb (skb); + +spin_lock_bh (&shaper->lock); +shaper_kick (shaper); +spin_unlock_bh (&shaper->lock); +del_timer_sync (&shaper->timer);return 0 ; }
@@ -576,6 +565,7 @@ static void shaper_init_priv(struct net_init_timer (&sh->timer); sh->timer.function=shaper_timer; sh->timer.data=(unsigned long )sh; +spin_lock_init (&sh->lock); }/*
fs/char_dev.c +1 -1
@@ -139,7 +139,7 @@ __unregister_chrdev_region(unsigned majostruct char_device_struct *cd =NULL , **cp;int i =major_to_index (major); -up (&chrdevs_lock); +down (&chrdevs_lock);for (cp = &chrdevs[i]; *cp; cp = &(*cp)->next) if ((*cp)->major == major && (*cp)->baseminor == baseminor &&
include/linux/if_shaper.h +1 -1
@@ -23,7 +23,7 @@ struct shaper__u32 shapeclock;unsigned long recovery;/* Time we can next clock a packet out on an empty queue */ -struct semaphore sem; +spinlock_t lock;struct net_device_stats stats;struct net_device *dev; int (*hard_start_xmit) (struct sk_buff *skb,
net/ipv4/ip_output.c +0 -3
@@ -111,7 +111,6 @@ static int ip_dev_loopback_xmit(struct s#ifdef CONFIG_NETFILTER_DEBUG nf_debug_ip_loopback_xmit (newskb);#endif -nf_reset (newskb);netif_rx (newskb);return 0 ; }
@@ -196,8 +195,6 @@ static inline int ip_finish_output2(strunf_debug_ip_finish_output2 (skb);#endif /*CONFIG_NETFILTER_DEBUG*/ -nf_reset (skb); -if (hh) {int hh_alen;
net/ipv4/netfilter/ip_conntrack_standalone.c +7 -0
@@ -432,6 +432,13 @@ static unsigned int ip_conntrack_defrag( const struct net_device *out, int (*okfn)(struct sk_buff *)) { +#if !defined(CONFIG_IP_NF_NAT ) && !defined(CONFIG_IP_NF_NAT_MODULE ) +/* Previously seen (loopback)? Ignore. Do this before +fragment check. */ +if ((*pskb)->nfct) +return NF_ACCEPT ; +#endif +/* Gather fragments. */ if ((*pskb)->nh.iph->frag_off &htons (IP_MF |IP_OFFSET )) { *pskb = ip_ct_gather_frags(*pskb,
net/packet/af_packet.c +6 -0
@@ -274,6 +274,9 @@ static int packet_rcv_spkt(struct sk_bufdst_release (skb->dst); skb->dst =NULL ; +/* drop conntrack reference */ +nf_reset (skb); + spkt = (struct sockaddr_pkt *)skb->cb;skb_push (skb, skb->data-skb->mac.raw);
@@ -517,6 +520,9 @@ static int packet_rcv(struct sk_buff *skdst_release (skb->dst); skb->dst =NULL ; +/* drop conntrack reference */ +nf_reset (skb); +spin_lock (&sk->sk_receive_queue.lock); po->stats.tp_packets++;__skb_queue_tail (&sk->sk_receive_queue, skb);
Quoted 7 lines · Greg KH
...
Summary of changes from v2.6.12.2 to v2.6.12.3
==============================================
...
Ralf Baechle:
SMP fix for 6pack driver
...
Will this patch [1] also be forward-ported to Linus' tree, or will 2.6.12.3 stay the _only_ 2.6 kernel that ever offered this driver for SMP configs?
cu
Adrian
[1] "fix" is a wrong patch description since all it does is to remove the BROKEN_ON_SMP dependency
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed