Menu
▾
▴
[LV-k25-commit] Linux for the VAX architecture: Changes to 'master'
|
From: Jan-Benedict G. <jb...@he...> - 2006-11-01 15:20:30
|
arch/ia64/kernel/mca_drv.c | 95 ++++++++---- arch/ia64/kernel/sal.c | 11 - arch/ia64/kernel/setup.c | 2 arch/ia64/kernel/smp.c | 12 - arch/powerpc/kernel/Makefile | 1 arch/powerpc/kernel/btext.c | 2 arch/powerpc/kernel/iommu.c | 77 +++++----- arch/powerpc/kernel/perfmon_fsl_booke.c | 221 ----------------------------- arch/powerpc/kernel/pmc.c | 2 arch/powerpc/kernel/traps.c | 18 +- arch/powerpc/kernel/vio.c | 4 arch/powerpc/lib/sstep.c | 5 arch/powerpc/mm/hugetlbpage.c | 3 arch/powerpc/oprofile/Makefile | 2 arch/powerpc/oprofile/common.c | 10 + arch/powerpc/oprofile/op_model_7450.c | 2 arch/powerpc/oprofile/op_model_fsl_booke.c | 170 +++++++++++++++++----- arch/powerpc/oprofile/op_model_power4.c | 2 arch/powerpc/oprofile/op_model_rs64.c | 2 arch/powerpc/platforms/iseries/iommu.c | 11 - arch/powerpc/platforms/pseries/iommu.c | 35 +--- arch/powerpc/sysdev/dart.h | 1 arch/powerpc/sysdev/dart_iommu.c | 8 - arch/powerpc/sysdev/qe_lib/qe.c | 3 arch/ppc/kernel/traps.c | 18 +- drivers/ata/ata_piix.c | 38 ---- drivers/ata/libata-core.c | 1 drivers/ata/libata.h | 1 drivers/ata/sata_sis.c | 21 +- drivers/net/Kconfig | 6 drivers/net/arm/ep93xx_eth.c | 40 +---- drivers/net/ehea/ehea_main.c | 11 - drivers/net/irda/stir4200.c | 3 drivers/net/myri10ge/myri10ge.c | 1 drivers/net/s2io.c | 11 + drivers/net/skge.c | 3 drivers/net/sky2.c | 9 - drivers/net/tokenring/proteon.c | 9 - drivers/net/tokenring/skisa.c | 9 - drivers/net/wan/n2.c | 6 drivers/video/offb.c | 36 +++- include/asm-ia64/sal.h | 1 include/asm-ia64/uaccess.h | 2 include/asm-powerpc/current.h | 12 + include/asm-powerpc/io.h | 7 include/asm-powerpc/iommu.h | 22 ++ include/asm-powerpc/oprofile_impl.h | 87 +++++++++++ include/asm-powerpc/pmc.h | 13 - include/asm-powerpc/system.h | 6 include/asm-powerpc/tce.h | 3 include/linux/libata.h | 1 net/sched/sch_netem.c | 2 52 files changed, 538 insertions(+), 540 deletions(-) New commits: commit 4b1c46a383aafc137bc91a0f9698bfc11e062d1b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4b1c46a383aafc137bc91a0f9698bfc11e062d1b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4b1c46a383aafc137bc91a0f9698bfc11e062d1b Merge: 30574b61611ccd29677989097f8c8a5d9a73d873 4393c4f6788cee65095dd838cfeca6edefbfeb52 Author: Linus Torvalds <tor...@g5...> Date: Wed Nov 1 06:38:20 2006 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Make alignment exception always check exception table [POWERPC] Disallow kprobes on emulate_step and branch_taken [POWERPC] Make mmiowb's io_sync preempt safe [POWERPC] Make high hugepage areas preempt safe [POWERPC] Make current preempt-safe [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR [POWERPC] Use 4kB iommu pages even on 64kB-page systems [POWERPC] Fix oprofile support for e500 in arch/powerpc [POWERPC] Fix rmb() for e500-based machines it [POWERPC] Fix various offb issues commit 30574b61611ccd29677989097f8c8a5d9a73d873 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=30574b61611ccd29677989097f8c8a5d9a73d873 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=30574b61611ccd29677989097f8c8a5d9a73d873 Merge: 0ca43235b34c92278fa903297acef37198ec3e26 c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 21:17:23 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M [PATCH] libata: unexport ata_dev_revalidate() [PATCH] Add 0x7110 piix to ata_piix.c [PATCH] sata_sis: fix flags handling for the secondary port commit 4393c4f6788cee65095dd838cfeca6edefbfeb52 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=4393c4f6788cee65095dd838cfeca6edefbfeb52 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=4393c4f6788cee65095dd838cfeca6edefbfeb52 Author: Benjamin Herrenschmidt <be...@ke...> Date: Wed Nov 1 15:11:39 2006 +1100 [POWERPC] Make alignment exception always check exception table The alignment exception used to only check the exception table for -EFAULT, not for other errors. That opens an oops window if we can coerce the kernel into getting an alignment exception for other reasons in what would normally be a user-protected accessor, which can be done via some of the futex ops. This fixes it by always checking the exception tables. Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0d69a052d4d7c4085706b9ac0d1bd28ff90c9fca Author: Gui,Jian <gu...@cn...> Date: Wed Nov 1 10:50:15 2006 +0800 [POWERPC] Disallow kprobes on emulate_step and branch_taken On powerpc, probing on emulate_step function will crash 2.6.18.1 when it is triggered. When kprobe is triggered, emulate_step() is on its kernel path and will cause recursive kprobe fault. And branch_taken() is called in emulate_step(). This disallows kprobes on both of them. Signed-off-by: Paul Mackerras <pa...@sa...> commit 292f86f005e3867277b2126c2399eea3e773a4fc gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=292f86f005e3867277b2126c2399eea3e773a4fc gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=292f86f005e3867277b2126c2399eea3e773a4fc Author: Hugh Dickins <hu...@ve...> Date: Tue Oct 31 18:41:51 2006 +0000 [POWERPC] Make mmiowb's io_sync preempt safe If mmiowb() is always used prior to releasing spinlock as Doc suggests, then it's safe against preemption; but I'm not convinced that's always the case. If preemption occurs between sync and get_paca()->io_sync = 0, I believe there's no problem. But in the unlikely event that gcc does the store relative to another register than r13 (as it did with current), then there's a small danger of setting another cpu's io_sync to 0, after it had just set it to 1. Rewrite ppc64 mmiowb to prevent that. The remaining io_sync assignments in io.h all get_paca()->io_sync = 1, which is harmless even if preempted to the wrong cpu (the context switch itself syncs); and those in spinlock.h are while preemption is disabled. Signed-off-by: Hugh Dickins <hu...@ve...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 96268889ee369b36203b7a06e8aabb197270216e gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=96268889ee369b36203b7a06e8aabb197270216e gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=96268889ee369b36203b7a06e8aabb197270216e Author: Hugh Dickins <hu...@ve...> Date: Tue Oct 31 18:40:39 2006 +0000 [POWERPC] Make high hugepage areas preempt safe Checking source for other get_paca()->field preemption dangers found that open_high_hpage_areas does a structure copy into its paca while preemption is enabled: unsafe however gcc accomplishes it. Just remove that copy: it's done safely afterwards by on_each_cpu, as in open_low_hpage_areas. Signed-off-by: Hugh Dickins <hu...@ve...> Acked-by: David Gibson <dw...@au...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 5fe8e8b88e68e517637e3f8287f1fee89e2d9252 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5fe8e8b88e68e517637e3f8287f1fee89e2d9252 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5fe8e8b88e68e517637e3f8287f1fee89e2d9252 Author: Hugh Dickins <hu...@ve...> Date: Tue Oct 31 18:39:31 2006 +0000 [POWERPC] Make current preempt-safe Repeated -j20 kernel builds on a G5 Quad running an SMP PREEMPT kernel would often collapse within a day, some exec failing with "Bad address". In each case examined, load_elf_binary was doing a kernel_read, but generic_file_aio_read's access_ok saw current->thread.fs.seg as USER_DS instead of KERNEL_DS. objdump of filemap.o shows gcc 4.1.0 emitting "mr r5,r13 ... ld r9,416(r5)" here for get_paca()->__current, instead of the expected and much more usual "ld r9,416(r13)"; I've seen other gcc4s do the same, but perhaps not gcc3s. So, if the task is preempted and rescheduled on a different cpu in between the mr and the ld, r5 will be looking at a different paca_struct from the one it's now on, pick up the wrong __current, and perhaps the wrong seg. Presumably much worse could happen elsewhere, though that split is rare. Other architectures appear to be safe (x86_64's read_pda is more limiting than get_paca), but ppc64 needs to force "current" into one instruction. Signed-off-by: Hugh Dickins <hu...@ve...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 302439d2167e0f1e01a6480ac40c06063f4e16a1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=302439d2167e0f1e01a6480ac40c06063f4e16a1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=302439d2167e0f1e01a6480ac40c06063f4e16a1 Author: Timur Tabi <ti...@fr...> Date: Tue Oct 31 17:53:42 2006 +0800 [POWERPC] qe_lib: qe_issue_cmd writes wrong value to CECDR Changed qe_issue_cmd() to write cmd_input to the CECDR unmodified. It was treating cmd_input as a virtual address and tried to convert it to a physical address. Signed-off-by: Timur Tabi <ti...@fr...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 5d2efba64b231a1733c4048d1708d77e07f26426 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5d2efba64b231a1733c4048d1708d77e07f26426 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5d2efba64b231a1733c4048d1708d77e07f26426 Author: Linas Vepstas <li...@au...> Date: Mon Oct 30 16:15:59 2006 +1100 [POWERPC] Use 4kB iommu pages even on 64kB-page systems The 10Gigabit ethernet device drivers appear to be able to chew up all 256MB of TCE mappings on pSeries systems, as evidenced by numerous error messages: iommu_alloc failed, tbl c0000000010d5c48 vaddr c0000000d875eff0 npages 1 Some experimentation indicates that this is essentially because one 1500 byte ethernet MTU gets mapped as a 64K DMA region when the large 64K pages are enabled. Thus, it doesn't take much to exhaust all of the available DMA mappings for a high-speed card. This patch changes the iommu allocator to work with its own unique, distinct page size. Although the patch is long, its actually quite simple: it just #defines a distinct IOMMU_PAGE_SIZE and then uses this in all the places that matter. As a side effect, it also dramatically improves network performance on platforms with H-calls on iommu translation inserts/removes (since we no longer call it 16 times for a 1500 bytes packet when the iommu HW is still 4k). In the future, we might want to make the IOMMU_PAGE_SIZE a variable in the iommu_table instance, thus allowing support for different HW page sizes in the iommu itself. Signed-off-by: Linas Vepstas <li...@au...> Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Acked-by: Olof Johansson <ol...@li...> Acked-by: Stephen Rothwell <sf...@ca...> Signed-off-by: Paul Mackerras <pa...@sa...> commit dd6c89f686bdb2a5de72fab636fc839e5a0add6d gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=dd6c89f686bdb2a5de72fab636fc839e5a0add6d gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=dd6c89f686bdb2a5de72fab636fc839e5a0add6d Author: Andy Fleming <afl...@fr...> Date: Fri Oct 27 15:06:32 2006 -0500 [POWERPC] Fix oprofile support for e500 in arch/powerpc Fixed a compile error in building the 85xx support with oprofile, and in the process cleaned up some issues with the fsl_booke performance monitor code. * Reorganized FSL Book-E performance monitoring code so that the 7450 wouldn't be built if the e500 was, and cleaned it up so it was more self-contained. * Added a cpu_setup function for FSL Book-E. The original cpu_setup function prototype had no arguments, assuming that the reg_setup function would copy the required information into variables which represented the registers. This was silly for e500, since it has 1 register per counter (rather than 3 for all counters), so the code has been restructured to have cpu_setup take the current counter config array as an argument, with op_powerpc_setup() invoking op_powerpc_cpu_setup() through on_each_cpu(), and op_powerpc_cpu_setup() invoking the model-specific cpu_setup function with an argument. The argument is ignored on all other platforms at present. * Fixed a confusing line where a trinary operator only had two arguments Signed-off-by: Andrew Fleming <afl...@fr...> Signed-off-by: Paul Mackerras <pa...@sa...> commit e0da0daee14862e0a5c49f2059641a8deb27eca2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=e0da0daee14862e0a5c49f2059641a8deb27eca2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=e0da0daee14862e0a5c49f2059641a8deb27eca2 Author: Andy Fleming <afl...@fr...> Date: Fri Oct 27 14:31:07 2006 -0500 [POWERPC] Fix rmb() for e500-based machines it The e500 core generates an illegal instruction exception when it tries to execute the lwsync instruction, which we currently use for rmb(). This fixes it by using the LWSYNC macro, which turns into a plain sync on 32-bit machines. Signed-off-by: Andrew Fleming <afl...@fr...> Signed-off-by: Paul Mackerras <pa...@sa...> commit 441cbd8dace80545db2ac43175ac1c097d96f75c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=441cbd8dace80545db2ac43175ac1c097d96f75c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=441cbd8dace80545db2ac43175ac1c097d96f75c Author: Benjamin Herrenschmidt <be...@ke...> Date: Thu Oct 26 15:38:10 2006 +1000 [POWERPC] Fix various offb issues This patch fixes a few issues in offb: - A test was inverted causing the palette hack to never work (no device node was passed down to the init function) - Some cards seem to have their assigned-addresses property in a random order, thus we need to try using of_get_pci_address() first, which will fail if it's not a PCI device, and fallback to of_get_address() in that case. of_get_pci_address() properly parsees assigned-addresses to test the BAR number and thus will get it right whatever the order is. - Some cards (like GXT4500) provide a linebytes of 0xffffffff in the device-tree which does no good. This patch handles that by using the screen width when that happens. (Also fixes btext.c while at it). - Add detection of the GXT4500 in addition to the GXT2000 for the palette hacks (we use the same hack, palette is linear in register space at offset 0x6000). Signed-off-by: Benjamin Herrenschmidt <be...@ke...> Signed-off-by: Paul Mackerras <pa...@sa...> commit c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 Author: Tejun Heo <ht...@gm...> Date: Mon Oct 9 13:23:58 2006 +0900 [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M ICH7M was separated from ICH6M to allow undocumented MAP value 01b which was spotted on an ASUS notebook. However, there is also notebooks with MAP value 01b on ICH6M. This patch re-merges ICH6M and ICH7M entries and allows MAP value 01b for both. This problem has been reported and initial patch provided by Jonathan Dieter. Signed-off-by: Tejun Heo <ht...@gm...> Cc: Jonathan Dieter <jd...@gm...> Cc: Tom Deblauwe <tom...@te...> Signed-off-by: Jeff Garzik <je...@ga...> commit 6e42acc4115bc376b8523acbcba2b2b7cc27d016 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=6e42acc4115bc376b8523acbcba2b2b7cc27d016 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=6e42acc4115bc376b8523acbcba2b2b7cc27d016 Author: Tejun Heo <ht...@gm...> Date: Fri Oct 27 19:08:42 2006 -0700 [PATCH] libata: unexport ata_dev_revalidate() ata_dev_revalidate() isn't used outside of libata core. Unexport it. Signed-off-by: Tejun Heo <ht...@gm...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit f833229c96c0bf53c05995e4bd58709d9e9edd67 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f833229c96c0bf53c05995e4bd58709d9e9edd67 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f833229c96c0bf53c05995e4bd58709d9e9edd67 Author: Jens Axboe <jen...@or...> Date: Tue Oct 31 09:31:37 2006 +0100 [PATCH] Add 0x7110 piix to ata_piix.c Hi Jeff, I tested the PATA support on my old VAIO notebook, and it failed to find my piix device: 00:07.1 Class 0101: 8086:7111 (rev 01) (prog-if 80 [Master]) Control: I/O+ Mem- BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- Latency: 64 Region 4: I/O ports at fc90 [size=16] This patch adds the pci id to ata_piix.c and things then work as expected. Signed-off-by: Jens Axboe <jen...@or...> Signed-off-by: Jeff Garzik <je...@ga...> commit cf0e812f0e90ee496af072b136e8bd02770387e6 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=cf0e812f0e90ee496af072b136e8bd02770387e6 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=cf0e812f0e90ee496af072b136e8bd02770387e6 Author: Tejun Heo <ht...@gm...> Date: Fri Oct 27 19:08:47 2006 -0700 [PATCH] sata_sis: fix flags handling for the secondary port sis_init_one() modifies probe_ent->port_flags after allocating and initializing it using ata_pci_init_native_mode(). This makes port_flags for the secondary port (probe_ent->pinfo2->flags) go out of sync resulting in misdetection of device due to incorrectly initialized SCR access flag. This patch make probe_ent alloc/init happen after the final port flags value is determined. This is fragile but probe_ent and all the related mess are scheduled to go away soon for exactly this reason. We just need to hold everything together till then. This has been spotted and diagnosed and tested by Patrick McHardy. Signed-off-by: Tejun Heo <ht...@gm...> Cc: Patric McHardy <ka...@tr...> Cc: Jeff Garzik <je...@ga...> Signed-off-by: Andrew Morton <ak...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 0ca43235b34c92278fa903297acef37198ec3e26 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=0ca43235b34c92278fa903297acef37198ec3e26 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=0ca43235b34c92278fa903297acef37198ec3e26 Author: Stephen Hemminger <she...@os...> Date: Wed Oct 18 13:39:28 2006 -0700 [PATCH] sky2: netpoll on dual port cards The sky2 driver uses a single NAPI poll routine for both ports on dual ported cards (because there is a single IRQ and status ring). Netpoll makes assumptions about the relationship between network device and NAPI that aren't correct on the second port, this will cause the port to never clear work. Most systems, just have single port, so not a big issue. The easy fix is just make the second port, not netpoll capable. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=798b6b19d7a4b6e1ea5340ec8b3b92811e05b81b Author: Stephen Hemminger <she...@os...> Date: Sun Oct 22 20:16:57 2006 -0700 [PATCH] skge, sky2, et all. gplv2 only I don't want my code to downgraded to GPLv3 because of cut-n-pasted the comments. These files which I hold copyright on were started before it was clear what GPLv3 was going to be. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 2ceaac755423cb93c1bb2f59ebd1a06f027ac095 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2ceaac755423cb93c1bb2f59ebd1a06f027ac095 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2ceaac755423cb93c1bb2f59ebd1a06f027ac095 Author: David Rientjes <rie...@cs...> Date: Mon Oct 30 14:19:25 2006 -0800 [PATCH] net s2io: return on NULL dev_alloc_skb() Checks for NULL dev_alloc_skb() and returns on true to avoid subsequent dereference. Cc: Jeff Garzik <jg...@po...> Cc: Christoph Hellwig <hc...@in...> Signed-off-by: David Rientjes <rie...@cs...> Signed-off-by: Jeff Garzik <je...@ga...> commit 1e1675ccf758cbb4303ab052d58405cda6c745a7 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e1675ccf758cbb4303ab052d58405cda6c745a7 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e1675ccf758cbb4303ab052d58405cda6c745a7 Author: Jan-Bernd Themann <oss...@de...> Date: Wed Oct 25 13:11:42 2006 +0200 [PATCH] ehea: kzalloc GFP_ATOMIC fix This patch fixes kzalloc parameters (GFP_ATOMIC instead of GFP_KERNEL) Signed-off-by: Jan-Bernd Themann <th...@de...> Signed-off-by: Jeff Garzik <je...@ga...> commit 1e7bed081968c42469bd02842b4190a115008221 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=1e7bed081968c42469bd02842b4190a115008221 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=1e7bed081968c42469bd02842b4190a115008221 Author: Brice Goglin <br...@my...> Date: Thu Oct 26 22:51:33 2006 +0200 [PATCH] myri10ge: ServerWorks HT2000 PCI id is already defined in pci_ids.h No need to keep defining PCI_DEVICE_ID_SERVERWORKS_HT2000_PCIE in the driver code since it is now defined in pci_ids.h. Signed-off-by: Brice Goglin <br...@my...> Signed-off-by: Jeff Garzik <je...@ga...> commit f479b322a0949d540b45aea645793058b0c50be5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f479b322a0949d540b45aea645793058b0c50be5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f479b322a0949d540b45aea645793058b0c50be5 Author: Stephen Hemminger <she...@os...> Date: Fri Oct 27 10:22:10 2006 -0700 [PATCH] sky2: not experimental The sky2 driver is no longer in experimental state. Signed-off-by: Stephen Hemminger <she...@os...> Signed-off-by: Jeff Garzik <je...@ga...> commit 09669585b5d0cfdebe28250d442693b3baac66a2 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=09669585b5d0cfdebe28250d442693b3baac66a2 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=09669585b5d0cfdebe28250d442693b3baac66a2 Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 03:47:12 2006 +0900 [PATCH] n2: fix confusing error code modprobe n2 with no parameters or no such devices will get confusing error message. # modprobe n2 ... Kernel does not have module support This patch replaces return code from -ENOSYS to -EINVAL. Cc: Jeff Garzik <jg...@po...> Cc: Krzysztof Halasa <kh...@pm...> Signed-off-by: Akinobu Mita <aki...@gm...> drivers/net/wan/n2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Signed-off-by: Jeff Garzik <je...@ga...> commit 9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=9d4df9e0fadfc84cd826e0f7e946691b4d7baee5 Author: Akinobu Mita <aki...@gm...> Date: Sun Oct 29 03:52:14 2006 +0900 [PATCH] tokenring: fix module_init error handling - Call platform_driver_unregister() before return when no cards found. (fixes data corruption when no cards found) - Check platform_device_register_simple() return value Cc: Jeff Garzik <jg...@po...> Cc: Mike Phillips <mi...@li...> Signed-off-by: Akinobu Mita <aki...@gm...> drivers/net/tokenring/proteon.c | 9 +++++++-- drivers/net/tokenring/skisa.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik <je...@ga...> commit 06f0015ace46ce9d313ec02d6b13c47c8e795a6c gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=06f0015ace46ce9d313ec02d6b13c47c8e795a6c gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=06f0015ace46ce9d313ec02d6b13c47c8e795a6c Author: Lennert Buytenhek <bu...@wa...> Date: Mon Oct 30 19:54:08 2006 +0100 [PATCH] ep93xx_eth: don't report RX errors Flooding the console with error messages for every RX FIFO overrun, checksum error and framing error isn't very sensible. Each of these errors can occur during normal operation, so stop printk'ing error messages for RX errors at all. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Jeff Garzik <je...@ga...> commit 79c356f44b26da9fe357ed1a11e7faec4fd94e13 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=79c356f44b26da9fe357ed1a11e7faec4fd94e13 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=79c356f44b26da9fe357ed1a11e7faec4fd94e13 Author: Lennert Buytenhek <bu...@wa...> Date: Mon Oct 30 19:52:54 2006 +0100 [PATCH] ep93xx_eth: fix unlikely(x) > y test Fix unlikely(x) > y test in ep93xx_eth. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Jeff Garzik <je...@ga...> commit 2d38caba5fd148976f54930782e8209fa45879a0 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=2d38caba5fd148976f54930782e8209fa45879a0 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=2d38caba5fd148976f54930782e8209fa45879a0 Author: Lennert Buytenhek <bu...@wa...> Date: Mon Oct 30 19:52:31 2006 +0100 [PATCH] ep93xx_eth: fix RX/TXstatus ring full handling Ray Lehtiniemi reported that an incoming UDP packet flood can lock up the ep93xx ethernet driver. Herbert Valerio Riedel noted that due to the way ep93xx_eth manages the RX/TXstatus rings, it cannot distinguish a full ring from an empty one, and correctly suggested that this was likely to be causing this lockup to occur. Instead of looking at the hardware's RX/TXstatus ring write pointers to determine when to stop reading from those rings, we should just check every individual RX/TXstatus descriptor's valid bit instead, since there is no other way to distinguish an empty ring from a full ring, and if there is a descriptor waiting, we take the hit of reading the descriptor from memory anyway. Signed-off-by: Lennert Buytenhek <bu...@wa...> Signed-off-by: Jeff Garzik <je...@ga...> commit d5b9b787b5e1618dfe82a2c2a6972374e85b02db gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=d5b9b787b5e1618dfe82a2c2a6972374e85b02db gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=d5b9b787b5e1618dfe82a2c2a6972374e85b02db Merge: 16b7b2ac0148e839da86af8747b6fa4aad43a9b7 024e4f2c5175a482c234cf67ed22368d770bf78f Author: Linus Torvalds <tor...@g5...> Date: Tue Oct 31 17:03:50 2006 -0800 Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Correct definition of handle_IPI [IA64] move SAL_CACHE_FLUSH check later in boot [IA64] MCA recovery: Montecito support [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access commit 024e4f2c5175a482c234cf67ed22368d770bf78f gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=024e4f2c5175a482c234cf67ed22368d770bf78f gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=024e4f2c5175a482c234cf67ed22368d770bf78f Author: Keith Owens <ka...@sg...> Date: Wed Oct 18 15:36:49 2006 +1000 [IA64] Correct definition of handle_IPI The declaration of handle_IPI in arch/ia64/kernel/smp.c was changed but not the definition of this function. Remove struct pt_regs from handle_IPI(). Signed-off-by: Keith Owens <ka...@sg...> Signed-off-by: Tony Luck <ton...@in...> commit fa1d19e5d9a94120f31e5783ab44758f46892d94 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=fa1d19e5d9a94120f31e5783ab44758f46892d94 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=fa1d19e5d9a94120f31e5783ab44758f46892d94 Author: Troy Heber <tro...@hp...> Date: Wed Oct 25 14:46:15 2006 -0600 [IA64] move SAL_CACHE_FLUSH check later in boot The check to see if the firmware drops interrupts during a SAL_CACHE_FLUSH is done to early in the boot. SAL_CACHE_FLUSH expects to be able to make PAL calls in virtual mode, on some cell based machines a fault occurs causing a MCA. This patch moves the check after mmu_context_init so the TLB and VHPT are properly setup. Signed-off-by Troy Heber <tro...@hp...> Signed-off-by: Tony Luck <ton...@in...> commit 264b0f99308436deaee38bab99e586612d012fc1 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=264b0f99308436deaee38bab99e586612d012fc1 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=264b0f99308436deaee38bab99e586612d012fc1 Author: Russ Anderson <rj...@sg...> Date: Wed Oct 25 17:59:47 2006 -0500 [IA64] MCA recovery: Montecito support The information in MCA records is filled in slightly differently on Montecito than on Madison/McKinley. Usually, the cache check and bus check target identifiers have the same address. On Montecito the cache check and bus check target identifiers can be different if a corrected error (ie SBE or unconsumed poison data) was encountered and then an uncorrected error (ie DBE) was consumed. In that case, the cache check target identifier is the physical address of the DBE (that caused the MCA to surface) while the bus check target identifier is the physical address of the SBE. This patch correctly finds the target identifier that triggered the MCA. If there are multiple valid cache target identifiers in the same error record then use the one with the lowest cache level. Signed-off-by: Russ Anderson (rj...@sg...) Signed-off-by: Tony Luck <ton...@in...> commit 5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=5ee7737379b1d7f0c977c0f1661fbaf01a8d4721 Author: Kenji Kaneshige <kan...@jp...> Date: Fri Oct 27 19:49:53 2006 +0900 [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI Signed-off-by: Kenji Kaneshige <kan...@jp...> Acked-by: Satoru Takeuchi <tak...@jp...> Acked-by: KAMEZAWA Hiroyuki <kam...@jp...> Signed-off-by: Tony Luck <ton...@in...> commit f2454a1a4b2aca38d3b7887619f43291d773c1ee gitweb-commit: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commit;h=f2454a1a4b2aca38d3b7887619f43291d773c1ee gitweb-diff: http://www.kernel.org/git/?p=linux/kernel/git/jbglaw/vax-linux.git;a=commitdiff;h=f2454a1a4b2aca38d3b7887619f43291d773c1ee Author: Jes Sorensen <je...@sg...> Date: Wed Oct 25 05:49:53 2006 -0400 [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access Don't PAGE_SHIFT pointer before handing it to virt_to_page() in xlate_dev_kmem_ptr() as it results in a double shift. Spotted by Bob Montgomery. Signed-off-by: Jes Sorensen <je...@sg...> Signed-off-by: Tony Luck <ton...@in...> |
