Re: Linux 2.6.20.17
Hi Marcel, On Sun, Aug 26, 2007 at 05:48:54PM +0200, Marcel Holtmann wrote: > Hi Boris, > > > > I'm getting build errors: > > > > > > x86_64 allyesconfig, allmodconfig: > > > > > > drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' > > > undeclared here (not in a function) > > > net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member > > > named 'tty_dev' > > > net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member > > > named 'tty_dev' > > > > > > After applying patch-2.6.20.17, I'm getting build errors either: > > > > net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add': > > net/bluetooth/rfcomm/tty.c:275: error: structure has no member named > > `tty_dev' > > net/bluetooth/rfcomm/tty.c:278: error: structure has no member named > > `tty_dev' > > make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 > > make[2]: *** [net/bluetooth/rfcomm] Error 2 > > make[1]: *** [net/bluetooth] Error 2 > > make: *** [net] Error 2 > > the device_move() support was introduced with 2.6.21 so it seems we have > a backport here that is not meant for this kernel. Eventhough I tried to be very careful this time, I got it wrong for these two patches affecting code I do not use :-( I'll fix all this mess ASAP in -18rc1. Regards, Willy - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
Hi Boris, > > I'm getting build errors: > > > > x86_64 allyesconfig, allmodconfig: > > > > drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' > > undeclared here (not in a function) > > net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member > > named 'tty_dev' > > net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member > > named 'tty_dev' > > > After applying patch-2.6.20.17, I'm getting build errors either: > > net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add': > net/bluetooth/rfcomm/tty.c:275: error: structure has no member named > `tty_dev' > net/bluetooth/rfcomm/tty.c:278: error: structure has no member named > `tty_dev' > make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 > make[2]: *** [net/bluetooth/rfcomm] Error 2 > make[1]: *** [net/bluetooth] Error 2 > make: *** [net] Error 2 the device_move() support was introduced with 2.6.21 so it seems we have a backport here that is not meant for this kernel. Regards Marcel - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
Hello, Randy Dunlap. On 25.08.2007 22:01 you said the following: I'm getting build errors: x86_64 allyesconfig, allmodconfig: drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev' After applying patch-2.6.20.17, I'm getting build errors either: net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add': net/bluetooth/rfcomm/tty.c:275: error: structure has no member named `tty_dev' net/bluetooth/rfcomm/tty.c:278: error: structure has no member named `tty_dev' make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 make[2]: *** [net/bluetooth/rfcomm] Error 2 make[1]: *** [net/bluetooth] Error 2 make: *** [net] Error 2 -- Boris B. Zhmurov mailto: [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
Hello, Randy Dunlap. On 25.08.2007 22:01 you said the following: I'm getting build errors: x86_64 allyesconfig, allmodconfig: drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev' After applying patch-2.6.20.17, I'm getting build errors either: net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add': net/bluetooth/rfcomm/tty.c:275: error: structure has no member named `tty_dev' net/bluetooth/rfcomm/tty.c:278: error: structure has no member named `tty_dev' make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 make[2]: *** [net/bluetooth/rfcomm] Error 2 make[1]: *** [net/bluetooth] Error 2 make: *** [net] Error 2 -- Boris B. Zhmurov mailto: [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
Hi Boris, I'm getting build errors: x86_64 allyesconfig, allmodconfig: drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev' After applying patch-2.6.20.17, I'm getting build errors either: net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add': net/bluetooth/rfcomm/tty.c:275: error: structure has no member named `tty_dev' net/bluetooth/rfcomm/tty.c:278: error: structure has no member named `tty_dev' make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 make[2]: *** [net/bluetooth/rfcomm] Error 2 make[1]: *** [net/bluetooth] Error 2 make: *** [net] Error 2 the device_move() support was introduced with 2.6.21 so it seems we have a backport here that is not meant for this kernel. Regards Marcel - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
Hi Marcel, On Sun, Aug 26, 2007 at 05:48:54PM +0200, Marcel Holtmann wrote: Hi Boris, I'm getting build errors: x86_64 allyesconfig, allmodconfig: drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev' After applying patch-2.6.20.17, I'm getting build errors either: net/bluetooth/rfcomm/tty.c: In function `rfcomm_dev_add': net/bluetooth/rfcomm/tty.c:275: error: structure has no member named `tty_dev' net/bluetooth/rfcomm/tty.c:278: error: structure has no member named `tty_dev' make[3]: *** [net/bluetooth/rfcomm/tty.o] Error 1 make[2]: *** [net/bluetooth/rfcomm] Error 2 make[1]: *** [net/bluetooth] Error 2 make: *** [net] Error 2 the device_move() support was introduced with 2.6.21 so it seems we have a backport here that is not meant for this kernel. Eventhough I tried to be very careful this time, I got it wrong for these two patches affecting code I do not use :-( I'll fix all this mess ASAP in -18rc1. Regards, Willy - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
On Sat, 25 Aug 2007 15:38:10 + Willy Tarreau wrote: > > I've just released Linux 2.6.20.17. > > As a reminder, it fixes these 3 security issues : > CVE-2007-3105 > CVE-2007-3848 > CVE-2007-3851 > > I'll also be replying to this message with a copy of the patch between > 2.6.20.16 and 2.6.20.17. > > The patch and changelog will appear soon at the following locations: > ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ > ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.17.bz2 > ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.20.17 > > Git repository: >git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git > http://www.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git > > Git repository through the gitweb interface: > http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git I'm getting build errors: x86_64 allyesconfig, allmodconfig: drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: Linux 2.6.20.17
diff --git a/Makefile b/Makefile
index b3806cb..bce2fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 20
-EXTRAVERSION = .16
+EXTRAVERSION = .17
NAME = Homicidal Dwarf Hamster
# *DOCUMENTATION*
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 10baa35..18c8b67 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -167,11 +167,13 @@ static void do_drv_read(struct drv_cmd *cmd)
static void do_drv_write(struct drv_cmd *cmd)
{
- u32 h = 0;
+ u32 lo, hi;
switch (cmd->type) {
case SYSTEM_INTEL_MSR_CAPABLE:
- wrmsr(cmd->addr.msr.reg, cmd->val, h);
+ rdmsr(cmd->addr.msr.reg, lo, hi);
+ lo = (lo & ~INTEL_MSR_RANGE) | (cmd->val & INTEL_MSR_RANGE);
+ wrmsr(cmd->addr.msr.reg, lo, hi);
break;
case SYSTEM_IO_CAPABLE:
acpi_os_write_port((acpi_io_address)cmd->addr.io.port,
@@ -372,7 +374,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy
*policy,
struct cpufreq_freqs freqs;
cpumask_t online_policy_cpus;
struct drv_cmd cmd;
- unsigned int msr;
unsigned int next_state = 0; /* Index into freq_table */
unsigned int next_perf_state = 0; /* Index into perf table */
unsigned int i;
@@ -417,11 +418,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy
*policy,
case SYSTEM_INTEL_MSR_CAPABLE:
cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
- msr =
- (u32) perf->states[next_perf_state].
- control & INTEL_MSR_RANGE;
- cmd.val = get_cur_val(online_policy_cpus);
- cmd.val = (cmd.val & ~INTEL_MSR_RANGE) | msr;
+ cmd.val = (u32) perf->states[next_perf_state].control;
break;
case SYSTEM_IO_CAPABLE:
cmd.type = SYSTEM_IO_CAPABLE;
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 831f540..eac3838 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1749,8 +1749,8 @@ fpload:
__ndelay:
save%sp, -STACKFRAME_SZ, %sp
mov %i0, %o0
- call.umul
-mov0x1ad, %o1 ! 2**32 / (1 000 000 000 / HZ)
+ call.umul ! round multiplier up so large ns ok
+mov0x1ae, %o1 ! 2**32 / (1 000 000 000 / HZ)
call.umul
mov%i1, %o1! udelay_val
ba delay_continue
@@ -1760,11 +1760,17 @@ __ndelay:
__udelay:
save%sp, -STACKFRAME_SZ, %sp
mov %i0, %o0
- sethi %hi(0x10c6), %o1
+ sethi %hi(0x10c7), %o1! round multiplier up so large us ok
call.umul
-or %o1, %lo(0x10c6), %o1 ! 2**32 / 1 000 000
+or %o1, %lo(0x10c7), %o1 ! 2**32 / 1 000 000
call.umul
mov%i1, %o1! udelay_val
+ sethi %hi(0x028f4b62), %l0! Add in rounding constant * 2**32,
+ or %g0, %lo(0x028f4b62), %l0
+ addcc %o0, %l0, %o0 ! 2**32 * 0.009 999
+ bcs,a 3f
+add%o1, 0x01, %o1
+3:
call.umul
movHZ, %o0 ! >>32 earlier for wider range
diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S
index a65eba4..1c37ea8 100644
--- a/arch/sparc/lib/memset.S
+++ b/arch/sparc/lib/memset.S
@@ -162,7 +162,7 @@ __bzero:
8:
add%o0, 1, %o0
subcc %o1, 1, %o1
- bne,a 8b
+ bne 8b
EX(stb %g3, [%o0 - 1], add %o1, 1)
0:
retl
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 06459ae..0e19369 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -458,7 +458,6 @@ tlb_fixup_done:
or %g6, %lo(init_thread_union), %g6
ldx [%g6 + TI_TASK], %g4
mov %sp, %l6
- mov %o4, %l7
wr %g0, ASI_P, %asi
mov 1, %g1
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 3f33165..419b2d5 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -5,7 +5,8 @@
* so I *must* declare good prototypes for them and then EXPORT them.
* The kernel code uses the macro defined by include/linux/string.h,
* so I undef macros; the userspace code does not include that and I
- * add an EXPORT for the glibc one.*/
+ * add an EXPORT for the glibc one.
+ */
#undef strlen
#undef strstr
@@ -61,12 +62,18 @@ EXPORT_SYMBOL_PROTO(dup2);
EXPORT_SYMBOL_PROTO(__xstat);
EXPORT_SYMBOL_PROTO(__lxstat);
EXPORT_SYMBOL_PROTO(__lxstat64);
+EXPORT_SYMBOL_PROTO(__fxstat64);
EXPORT_SYMBOL_PROTO(lseek);
EXPORT_SYMBOL_PROTO(lseek64);
EXPORT_SYMBOL_PROTO(chown);
Linux 2.6.20.17
I've just released Linux 2.6.20.17. As a reminder, it fixes these 3 security issues : CVE-2007-3105 CVE-2007-3848 CVE-2007-3851 I'll also be replying to this message with a copy of the patch between 2.6.20.16 and 2.6.20.17. The patch and changelog will appear soon at the following locations: ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.17.bz2 ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.20.17 Git repository: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git http://www.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git Git repository through the gitweb interface: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git Willy --- Makefile |2 arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c| 13 +-- arch/sparc/kernel/entry.S | 14 ++- arch/sparc/lib/memset.S|2 arch/sparc64/kernel/head.S |1 arch/um/os-Linux/user_syms.c | 20 +--- drivers/ata/ata_piix.c |2 drivers/ata/pata_atiixp.c |1 drivers/base/cpu.c |2 drivers/char/drm/i915_dma.c| 14 ++- drivers/char/drm/i915_drv.h|1 drivers/char/random.c |9 +- drivers/char/sx.c |4 drivers/cpufreq/cpufreq_ondemand.c | 30 -- drivers/kvm/svm.c |6 + drivers/kvm/svm.h |3 drivers/md/dm-crypt.c |5 - drivers/md/dm-exception-store.c| 11 +- drivers/md/dm-mpath.c |3 drivers/md/dm-snap.c | 11 -- drivers/md/dm.c|9 ++ drivers/md/raid10.c| 10 ++ drivers/media/video/v4l2-common.c | 19 +++- drivers/media/video/wm8739.c |2 drivers/media/video/wm8775.c |2 drivers/net/forcedeth.c| 108 ++--- drivers/pcmcia/cs.c|3 drivers/scsi/aacraid/linit.c |4 drivers/usb/core/hub.c | 10 +- drivers/video/macmodes.c |5 - drivers/video/macmodes.h |8 - drivers/video/stifb.c | 19 ++-- fs/9p/conv.c |1 fs/direct-io.c |1 fs/exec.c | 13 ++- fs/ext4/extents.c |2 fs/jbd/commit.c|3 fs/jbd2/commit.c |3 fs/nfsd/vfs.c |2 fs/splice.c|5 - include/linux/Kbuild |1 include/linux/netfilter_ipv4/ipt_iprange.h |2 include/net/bluetooth/rfcomm.h |1 include/net/xfrm.h |1 ipc/shm.c |2 kernel/lockdep_proc.c |2 mm/hugetlb.c | 15 ++- mm/mlock.c |5 - mm/readahead.c | 12 ++ net/bluetooth/rfcomm/tty.c | 34 ++- net/core/gen_estimator.c | 82 +++--- net/core/netpoll.c |2 net/ieee80211/softmac/ieee80211softmac_assoc.c |5 - net/ieee80211/softmac/ieee80211softmac_wx.c| 11 +- net/ipv6/addrconf.c|1 net/ipv6/anycast.c |1 net/ipv6/icmp.c|2 net/ipv6/tcp_ipv6.c|1 net/sctp/ipv6.c|4 net/sunrpc/auth_gss/svcauth_gss.c |9 +- net/xfrm/xfrm_policy.c |2 61 files changed, 410 insertions(+), 168 deletions(-) Summary of changes from 2.6.20.16 to 2.6.20.17 Adrian Bunk (2): Missing header include in ipt_iprange.h drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit Alan Cox (1): aacraid: fix security hole Alan Stern (1): USB: fix warning caused by autosuspend counter going negative Alexander Shmelev (1): Fix sparc32 memset() Alexey Dobriyan (1): Fix leak on /proc/lockdep_stats Arne Redlich (1): md: handle writes to broken raid10 arrays gracefully Ayaz Abdulla (2): forcedeth bug fix: cicada phy forcedeth bug fix
Linux 2.6.20.17
I've just released Linux 2.6.20.17. As a reminder, it fixes these 3 security issues : CVE-2007-3105 CVE-2007-3848 CVE-2007-3851 I'll also be replying to this message with a copy of the patch between 2.6.20.16 and 2.6.20.17. The patch and changelog will appear soon at the following locations: ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.17.bz2 ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.20.17 Git repository: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git http://www.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git Git repository through the gitweb interface: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git Willy --- Makefile |2 arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c| 13 +-- arch/sparc/kernel/entry.S | 14 ++- arch/sparc/lib/memset.S|2 arch/sparc64/kernel/head.S |1 arch/um/os-Linux/user_syms.c | 20 +--- drivers/ata/ata_piix.c |2 drivers/ata/pata_atiixp.c |1 drivers/base/cpu.c |2 drivers/char/drm/i915_dma.c| 14 ++- drivers/char/drm/i915_drv.h|1 drivers/char/random.c |9 +- drivers/char/sx.c |4 drivers/cpufreq/cpufreq_ondemand.c | 30 -- drivers/kvm/svm.c |6 + drivers/kvm/svm.h |3 drivers/md/dm-crypt.c |5 - drivers/md/dm-exception-store.c| 11 +- drivers/md/dm-mpath.c |3 drivers/md/dm-snap.c | 11 -- drivers/md/dm.c|9 ++ drivers/md/raid10.c| 10 ++ drivers/media/video/v4l2-common.c | 19 +++- drivers/media/video/wm8739.c |2 drivers/media/video/wm8775.c |2 drivers/net/forcedeth.c| 108 ++--- drivers/pcmcia/cs.c|3 drivers/scsi/aacraid/linit.c |4 drivers/usb/core/hub.c | 10 +- drivers/video/macmodes.c |5 - drivers/video/macmodes.h |8 - drivers/video/stifb.c | 19 ++-- fs/9p/conv.c |1 fs/direct-io.c |1 fs/exec.c | 13 ++- fs/ext4/extents.c |2 fs/jbd/commit.c|3 fs/jbd2/commit.c |3 fs/nfsd/vfs.c |2 fs/splice.c|5 - include/linux/Kbuild |1 include/linux/netfilter_ipv4/ipt_iprange.h |2 include/net/bluetooth/rfcomm.h |1 include/net/xfrm.h |1 ipc/shm.c |2 kernel/lockdep_proc.c |2 mm/hugetlb.c | 15 ++- mm/mlock.c |5 - mm/readahead.c | 12 ++ net/bluetooth/rfcomm/tty.c | 34 ++- net/core/gen_estimator.c | 82 +++--- net/core/netpoll.c |2 net/ieee80211/softmac/ieee80211softmac_assoc.c |5 - net/ieee80211/softmac/ieee80211softmac_wx.c| 11 +- net/ipv6/addrconf.c|1 net/ipv6/anycast.c |1 net/ipv6/icmp.c|2 net/ipv6/tcp_ipv6.c|1 net/sctp/ipv6.c|4 net/sunrpc/auth_gss/svcauth_gss.c |9 +- net/xfrm/xfrm_policy.c |2 61 files changed, 410 insertions(+), 168 deletions(-) Summary of changes from 2.6.20.16 to 2.6.20.17 Adrian Bunk (2): Missing header include in ipt_iprange.h drivers/video/macmodes.c:mac_find_mode() mustn't be __devinit Alan Cox (1): aacraid: fix security hole Alan Stern (1): USB: fix warning caused by autosuspend counter going negative Alexander Shmelev (1): Fix sparc32 memset() Alexey Dobriyan (1): Fix leak on /proc/lockdep_stats Arne Redlich (1): md: handle writes to broken raid10 arrays gracefully Ayaz Abdulla (2): forcedeth bug fix: cicada phy forcedeth bug fix
Re: Linux 2.6.20.17
diff --git a/Makefile b/Makefile
index b3806cb..bce2fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 20
-EXTRAVERSION = .16
+EXTRAVERSION = .17
NAME = Homicidal Dwarf Hamster
# *DOCUMENTATION*
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 10baa35..18c8b67 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -167,11 +167,13 @@ static void do_drv_read(struct drv_cmd *cmd)
static void do_drv_write(struct drv_cmd *cmd)
{
- u32 h = 0;
+ u32 lo, hi;
switch (cmd-type) {
case SYSTEM_INTEL_MSR_CAPABLE:
- wrmsr(cmd-addr.msr.reg, cmd-val, h);
+ rdmsr(cmd-addr.msr.reg, lo, hi);
+ lo = (lo ~INTEL_MSR_RANGE) | (cmd-val INTEL_MSR_RANGE);
+ wrmsr(cmd-addr.msr.reg, lo, hi);
break;
case SYSTEM_IO_CAPABLE:
acpi_os_write_port((acpi_io_address)cmd-addr.io.port,
@@ -372,7 +374,6 @@ static int acpi_cpufreq_target(struct cpufreq_policy
*policy,
struct cpufreq_freqs freqs;
cpumask_t online_policy_cpus;
struct drv_cmd cmd;
- unsigned int msr;
unsigned int next_state = 0; /* Index into freq_table */
unsigned int next_perf_state = 0; /* Index into perf table */
unsigned int i;
@@ -417,11 +418,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy
*policy,
case SYSTEM_INTEL_MSR_CAPABLE:
cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
- msr =
- (u32) perf-states[next_perf_state].
- control INTEL_MSR_RANGE;
- cmd.val = get_cur_val(online_policy_cpus);
- cmd.val = (cmd.val ~INTEL_MSR_RANGE) | msr;
+ cmd.val = (u32) perf-states[next_perf_state].control;
break;
case SYSTEM_IO_CAPABLE:
cmd.type = SYSTEM_IO_CAPABLE;
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 831f540..eac3838 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -1749,8 +1749,8 @@ fpload:
__ndelay:
save%sp, -STACKFRAME_SZ, %sp
mov %i0, %o0
- call.umul
-mov0x1ad, %o1 ! 2**32 / (1 000 000 000 / HZ)
+ call.umul ! round multiplier up so large ns ok
+mov0x1ae, %o1 ! 2**32 / (1 000 000 000 / HZ)
call.umul
mov%i1, %o1! udelay_val
ba delay_continue
@@ -1760,11 +1760,17 @@ __ndelay:
__udelay:
save%sp, -STACKFRAME_SZ, %sp
mov %i0, %o0
- sethi %hi(0x10c6), %o1
+ sethi %hi(0x10c7), %o1! round multiplier up so large us ok
call.umul
-or %o1, %lo(0x10c6), %o1 ! 2**32 / 1 000 000
+or %o1, %lo(0x10c7), %o1 ! 2**32 / 1 000 000
call.umul
mov%i1, %o1! udelay_val
+ sethi %hi(0x028f4b62), %l0! Add in rounding constant * 2**32,
+ or %g0, %lo(0x028f4b62), %l0
+ addcc %o0, %l0, %o0 ! 2**32 * 0.009 999
+ bcs,a 3f
+add%o1, 0x01, %o1
+3:
call.umul
movHZ, %o0 ! 32 earlier for wider range
diff --git a/arch/sparc/lib/memset.S b/arch/sparc/lib/memset.S
index a65eba4..1c37ea8 100644
--- a/arch/sparc/lib/memset.S
+++ b/arch/sparc/lib/memset.S
@@ -162,7 +162,7 @@ __bzero:
8:
add%o0, 1, %o0
subcc %o1, 1, %o1
- bne,a 8b
+ bne 8b
EX(stb %g3, [%o0 - 1], add %o1, 1)
0:
retl
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 06459ae..0e19369 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -458,7 +458,6 @@ tlb_fixup_done:
or %g6, %lo(init_thread_union), %g6
ldx [%g6 + TI_TASK], %g4
mov %sp, %l6
- mov %o4, %l7
wr %g0, ASI_P, %asi
mov 1, %g1
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 3f33165..419b2d5 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -5,7 +5,8 @@
* so I *must* declare good prototypes for them and then EXPORT them.
* The kernel code uses the macro defined by include/linux/string.h,
* so I undef macros; the userspace code does not include that and I
- * add an EXPORT for the glibc one.*/
+ * add an EXPORT for the glibc one.
+ */
#undef strlen
#undef strstr
@@ -61,12 +62,18 @@ EXPORT_SYMBOL_PROTO(dup2);
EXPORT_SYMBOL_PROTO(__xstat);
EXPORT_SYMBOL_PROTO(__lxstat);
EXPORT_SYMBOL_PROTO(__lxstat64);
+EXPORT_SYMBOL_PROTO(__fxstat64);
EXPORT_SYMBOL_PROTO(lseek);
EXPORT_SYMBOL_PROTO(lseek64);
EXPORT_SYMBOL_PROTO(chown);
+EXPORT_SYMBOL_PROTO(fchown);
Re: Linux 2.6.20.17
On Sat, 25 Aug 2007 15:38:10 + Willy Tarreau wrote: I've just released Linux 2.6.20.17. As a reminder, it fixes these 3 security issues : CVE-2007-3105 CVE-2007-3848 CVE-2007-3851 I'll also be replying to this message with a copy of the patch between 2.6.20.16 and 2.6.20.17. The patch and changelog will appear soon at the following locations: ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/patch-2.6.20.17.bz2 ftp://ftp.all.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.20.17 Git repository: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git http://www.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git Git repository through the gitweb interface: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.20.y.git I'm getting build errors: x86_64 allyesconfig, allmodconfig: drivers/ata/pata_atiixp.c:286: error: 'PCI_DEVICE_ID_ATI_IXP700_IDE' undeclared here (not in a function) net/bluetooth/rfcomm/tty.c:275: error: 'struct rfcomm_dev' has no member named 'tty_dev' net/bluetooth/rfcomm/tty.c:278: error: 'struct rfcomm_dev' has no member named 'tty_dev' --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code *** - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
