Linux 2.6.8-rc3

Linux 2.6.8-rc3

[Linus Torvalds]

Tons of small fixes all around the tree.

There's an optimized assembly AES implementation for x86 (from Brian 
Gladman), and a number of driver updates, all of which are reasonably 
minor.

It would be good if people only sent serious stuff for a while, and we can 
do a real 2.6.8, ok?

		Linus

-----
Summary of changes from v2.6.8-rc2 to v2.6.8-rc3
============================================

<aegl:agluck-lia64.sc.intel.com>:
  o #   Signed-off-by: Gordon Jin <gordon.jin@intel.com>

<bgerst:quark.didntduck.org>:
  o remove boot98
  o Remove symbol_is()

<gdavis:mvista.com>:
  o kbuild: Allow `make O=<obj> {cscope,tags}` to work

<j.blunck:tu-harburg.de>:
  o ext2_readdir() return value fix

<josha:sgi.com>:
  o ia64: fix obsolete and now misleading comment

<js:convergence.de>:
  o dvb_usercopy() fix

<linville:redhat.com>:
  o [sound/oss i810] add MMIO DSP support
  o [sound/oss i810] misc small changes

<macro:linux-mips.org>:
  o MAINTAINERS update

<master:sectorb.msk.ru>:
  o Fix UNIX98 pty indices leak

<mbp:sourcefrog.net>:
  o lost error code in rescan_partitions
  o trivial doc patch for partitions

<michael.kerrisk:gmx.net>:
  o Off-by-one error for SIGXCPU / RLIMIT_CPU checking

<miklos:szeredi.hu>:
  o fix readahead breakage for sequential after random reads

<nacc:us.ibm.com>:
  o [SPARC]: bbc_envctrl: Replace schedule_timeout() with msleep()
  o [SPARC]: envctrl: Replace schedule_timeout() with msleep()
  o [NET]: Use msleep() in sungem driver
  o macintosh/adb: replace schedule_timeout() with msleep()
  o ide/pmac: replace schedule_timeout() with msleep()
  o macintosh/mediabay: replace schedule_timeout() with msleep()

<rhim:cc.gatech.edu>:
  o Remove dead comment in mm/filemap.c

<roman.fietze:telemotive.de>:
  o clean up n_tty alloc_buf()

<rsa:us.ibm.com>:
  o ppc64: HVCS driver

<samuel.thibault:ens-lyon.org>:
  o front buttons wouldn't mute ESS Maestro

<shrybman:aei.ca>:
  o page_cache_readahead unused variable

<suckfish:ihug.co.nz>:
  o [IPV6]: Trivial fix for ipv6_addr_hash()

<tnt:246tnt-laptop.lan.ayanami.246tnt.com>:
  o [ppc] Add basic support for the Freescale MPC52xx embedded CPU and
    the LITE5200 platform
  o [serial/ppc] Add support for MPC52xx PSCs

Adrian Bunk:
  o [NET]: Update NET_SCH_NETEM Kconfig help text
  o remove outdated reference to Documentation/arm/SA1100/PCMCIA
  o Canonically reference files in Documentation/ code comments part

Alan Cox:
  o DVB major number
  o Subject: PATCH: fix bogus ioctl return in mtrr
  o Fix HPT366 crash and support HPT372N
  o fdomain_cs ISA fix

Alan Hourihane:
  o [AGPGART] Intel I915 support

Alexander Viro:
  o Missing mnt_namespace update in copy_namespace()
  o sparse: simplify and tighten sparse typechecking
  o size_t portability fixes
  o appletalk SIOCADDRT fix
  o rndis fix
  o bluetooth annotations
  o more NULL noise removal in sound/*
  o #if abuse is sound/*
  o tea575 fix
  o check_region fixes
  o dmasound annotation
  o misc sound/* fixes
  o broken stuff in sound/* marked as such in Kconfig
  o security/selinux/hooks.c compile fix
  o openpromfs annotation
  o more NULL noise removal in fs/*
  o bpck6 compile fix on ppc
  o impi annotation
  o mtd fixes
  o NULL noise removal in drivers/net/*
  o #if abuse in drivers/net/*
  o solaris emulation annotated
  o sparc32 emulation annotated
  o NULL noise removal on ppc
  o drm/gamma_old_dma.h fix
  o NULL noise removal in drivers/*
  o CONFIG_MCOUNT fix for sparc64
  o #if abuses in drivers/*
  o annotations for arch/ppc and include/asm-ppc
  o cciss compat ioctl fix
  o zoran switched to seq_file
  o dpt_i2o annotations
  o via-velocity switched use of to if_mii()
  o drivers/macintosh annotations
  o pointer-to-int conversion fixes
  o ffb_context annotation
  o asm-ppc/reg.h namespace pollution fixes
  o missing (void) in reiserfs on big-endian boxen
  o broken stuff marked as such in Kconfig
  o drivers/ieee1394 annotation
  o signed char fixes in drivers/*
  o inline reordering in drivers/*
  o cpumask updates in open_pic.c (ppc)
  o wrong ifdef in ppc/kernel/setup.c (nvram)
  o con_font_op split
  o con_font_default sanitized
  o con_font_copy sanitized
  o con_set_font sanitized
  o fbcon_do_set_font() sanitized
  o con_get_font sanitized
  o console_font_op annotated
  o fb_cursor() fixes
  o cmap annotations
  o inline fixes in net/*
  o annotations in drivers/video
  o sparse: ftape
  o sparse: istallion
  o sparse: stallion
  o sparse: drivers/char/*
  o NULL noise removal in skfp
  o #if abuses
  o ARM initial annotations
  o sparse: more in isdn
  o sparse: more in drivers/net
  o size_t portability fixes
  o signed char portability fix
  o sparse: misc cleanups

Alexey Dobriyan:
  o Fix menuconfig partial inability to show help texts

Andi Kleen:
  o x86-64 fixes
  o [PATCH 1/8] gcc-3.5 fixes
  o [PATCH 2/8] gcc-3.5 fixes
  o [PATCH 3/8] gcc-3.5 fixes
  o [PATCH 4/8] gcc-3.5 fixes
  o [PATCH 5/8] gcc-3.5 fixes
  o [PATCH 6/8] gcc-3.5 fixes
  o [PATCH 7/8] gcc-3.5 fixes
  o [PATCH 8/8] gcc-3.5 fixes
  o Documentation fix for NMI watchdog

Andrea Arcangeli:
  o writepages drops bh on not uptodate page

Andreas Schwab:
  o kbuild: scripts/genksyms/parse.c_shipped needs to be rebuilt

Andrew Chew:
  o [ata] fix reversed bit definitions in linux/ata.h

Andrew Morton:
  o ncpfs: setattr return value fix
  o slab memory shrinking balancing fix
  o oom-killer: call show_free_areas
  o [BRIDGE]: Build fix for gcc-2.95.x

Andy Whitcroft:
  o is_highmem() and WANT_PAGE_VIRTUAL

Anton Blanchard:
  o Fix ppc64 max_pfn issue
  o Fix ppc64 max_pfn issue - again
  o ppc64: exception path optimisations
  o [NET]: Use NET_IP_ALIGN in acenic
  o ppc64: remove multiple IRQ optimisation
  o sched: use for_each_cpu
  o ppc64: fix hotplug irq migration code

Armin Schindler:
  o ISDN Eicon driver: use msleep()

Arnd Bergmann:
  o DVB: "errno" undefined

Art Haas:
  o [SPARC32]: Remove duplicate pci_dma_mapping_error()

Arun Sharma:
  o compat_clock_getres shouldn't return -EFAULT if res == NULL

Bart Samwel:
  o Add documentation about /proc/sys/vm/laptop_mode to various docs

Benjamin Herrenschmidt:
  o ppc64: hash table races fixes
  o ppc64: fix memcpy_to/from_io
  o ppc32: Workaround new MPC745x CPU erratas
  o ppc32: Fix problem with spurrious edge interrupts on old
  o ppc64: Start the FCU in therm_pm72.c

Bert Hubert:
  o [IPSEC]: Fix UDP decap code

Bjorn Helgaas:
  o Fix up HP copyright & license text
  o rename CONFIG_PCI_USE_VECTOR to CONFIG_PCI_MSI
  o HPET copyrights, cleanup

Brian Gerst:
  o kbuild: Move modpost files to a new subdir scripts/mod
  o remove scripts/mkconfigs

Chas Williams:
  o [ATM]: use try_module_get appropriately (from Stephen Hemminger
    <shemminger@osdl.org>)
  o [ATM]: [lec] remove unnecessary inlines (from Adrian Bunk
    <bunk@fs.tum.de>)

Chris Wright:
  o ethtool_get_regs copy right number of bytes to user

Christoph Hellwig:
  o modular swim3
  o Fix modular anscd

Con Kolivas:
  o [IPV6]: Fix route.c gcc-3.4.x inlining error
  o [IPV6]: Fix gcc-341 inlining for real

Corey Minyard:
  o convert ipmi_watchdog to use module option nowayout

Dave Hansen:
  o ppc64: __make_room() warning fix
  o ppc64: fix off-by-one in mem_init()

Dave Jones:
  o [AGPGART] VIA K8T890 Host Bridge support
  o [AGPGART] VIA VT838x [K8T800/K8M800/K8N800] support
  o [AGPGART] VIA KT880 support
  o [AGPGART] VIA VT83xx/VT87xx/KTxxx/Px8xx support
  o [AGPGART] VIA P4M800 support
  o [AGPGART] Add support for SiS 5591

David Dillow:
  o [SPARC64]: Handle SBUS dma allocations larger than 1MB

David Eger:
  o pmac_zilog: serial minors taken failure path fix

David Gibson:
  o page align emergency stack
  o ppc64: fix RAS irq handlers
  o ppc64: remove #include processor.h from div64.S

David Howells:
  o PPC openpic driver cpumask_t changes

David Mosberger:
  o ia64: Nuke two compiler-warnings
  o NX: allow architectures to select legacy mode dynamically
  o ia64: Clean up arch/ia64/kernel/irq.c a bit
  o ia64: Oops, SN2 needs pending_irq_cpumask to be global
  o ia64: Update defconfig
  o ia64: Update for elf_read_implies_exec() macro changes in mainline
    tree
  o Make get_user_pages() work again for ia64 gate area
  o comment "ptrace_list" and "children" members

David S. Miller:
  o [TG3]: Delay both before and after PCI cfg space readback after
    reset
  o [TG3]: Bump driver version and reldate
  o [SPARC64]: Export __copy_in_user to modules
  o [SPARC64]: Update defconfig
  o [SPARC64]: Fix allnoconfig build, based upon a patch from Roland
    Dreier
  o [IPV4]: Make raw sockets behave like udp wrt. MSG_TRUNC
  o [ATM]: Update Marko Kiiskila's email address
  o [TCP]: Do not overflow 16-bit window field in tcp_select_window()
  o [SPARC64]: Uninline _raw_spin_lock too, saves ~30K in defconfig
    image
  o [PKT_SCHED]: Alpha not studly enough for SCH_CLK_CPU
  o Cset exclude: shemminger@osdl.org|ChangeSet|20040722205059|21273
  o [SCTP]: Fix mis-merge
  o Cset exclude:
    davem@nuts.davemloft.net|ChangeSet|20040723204655|22654
  o [SPARC64]: Kill all this silly inline memcpy handling
  o [SPARC]: bbc_envctrl.c needs linux/delay.h
  o [SPARC64]: Simplify and optimize ultra3 memory copies
  o [SPARC64]: Update defconfig
  o [SPARC64]: Do not duplicate compat dirent code
  o [SPARC]: sparc64 openpromio.h needs compiler.h, sync sparc32
  o [NET]: Decrease skb->cb[] to 40 bytes
  o [XFRM]: Declare xfrm6_output in net/xfrm.h
  o [DMA]: Fix example code in DMA-mapping.txt
  o [SPARC64]: Update defconfig
  o [NET]: Kill NET_FASTROUTE, does nothing and suffers from major
    bitrot

David Woodhouse:
  o WindRiver SBC8560: Set all internal IRQs level-triggered
  o Fix UART detection on WindRiver SBC8560
  o Fix UART initialisation on WindRiver SBC8560

Dax Kelson:
  o Config file for laptop mode

Deepak Saxena:
  o [ARM] IXP4xx: platform_add_device() to platform_add_devices()
    conversion
  o [ARM] Export ixp42xx_pci_read/write so PCI driver modules load
  o [ARM] Fix _find_next_bit_be prototype to use 'const' qualifier
  o Watchdog driver for Intel IXP2000 Network Processor

Dominik Brodowski:
  o Asus M2N notebook hides SMBus device

Geert Uytterhoeven:
  o M68k 68060 errata I14
  o M68k ifpsp060
  o m68k sparse missing void
  o m68k sparse #if vs. #ifdef
  o m68k sparse void return
  o m68k sparse extern
  o m68k sparse inline
  o dsp56k sparse const
  o m68k sparse floating point
  o dnfb sparse struct init
  o amifb sparse &=
  o m68k hardirq.h
  o dmasound paths
  o M68k bitops
  o M68k checksum include
  o M68k pgalloc fixup
  o M68k Maintainership
  o depends on PCI: Multi-Tech, SyncLink, Applicom serial
  o !PCI warnings: Moxa serial
  o !PCI warnings: Specialix serial
  o depends on PCI: VIA686A i2c
  o depends on PCI DMA API: IEEE1394 core and SBP-2
  o depends on PCI: Fritz!PCI/PCIv2/PnP and HYSDN
  o !PCI warnings: Hisax ISDN
  o depends on PCI: Guillemot MAXI Radio FM 2000
  o depends on PCI: Technisat Skystar2 PCI
  o depends on PCI DMA API: Cisco/Aironet 34X/35X/4500/4800
  o depends on PCI: Toshiba and VIA FIR
  o depends on PCI: Matrox 1-wire
  o Dallas 1-wire delay.h
  o cirrusfb: update for amiga (zorro)
  o remove faulty __init's from drivers/video/fbmem.c

Greg Edwards:
  o kbuild: build binary rpm from pre-built tree

Guido Guenther:
  o Fix rivafb's NV_ARCH_, cleanup DEBUG, backlight control on ppc

Harald Welte:
  o [NETFILTER]: Fix compilation of ip_nat_snmp_basic.c

Heiko Carstens:
  o s390: zfcp host adapter

Herbert Xu:
  o [CRYPTO]: Fix stack overrun in crypt()
  o [IPSEC]: Fix IPCOMP6 ICMP type check
  o [INET]: Create enum of ECN bits
  o [IPSEC]: Missing unlock in policy timer
  o [AH6]: Disallow mutable bits after AH header
  o [AH4]: Save daddr iff options are present
  o [AH6]: Replace skb by iph in clear_mutable_options
  o [AH6]: Get things working again
  o [NET]: Allow MD5 to be a module
  o [AH6]: Rearrange routing headers
  o [IPSEC]: Move generic encap code into xfrm6_output
  o [IPSEC]: Fix SPI generation by netlink_get_spi()
  o [IPSEC]: Remove redundant check in xfrm_state_add()
  o [IPSEC]: xfrm_alloc_spi always succeeds on non-trivial range
  o [PF_KEY]: spirange should be in host byte order
  o [IPSEC]: Remove unnecessary inet_ecn.h inclusions
  o [IPSEC]: Move xfrm[46]_tunnel_check_size into xfrm[46]_output.c

Hideaki Yoshifuji:
  o [NET] convert storage for MIB from struct member to array item
  o [NET] use SNMP_MIB_ITEM for MIB description
  o [NET] fold long comment lines
  o [NET] use seq_puts() where appropriate
  o [IPV4] Look up route with appropriate protocol when we connect()
  o [IPV6] remove rather pointless comment
  o [IPV6] fix typoes in macro definitions
  o [IPV6] remove unused macro
  o [IPV6] fix the order of icmpv6 definitions for consistency
  o [IPV6] add missing known icmpv6 types

Hirofumi Ogawa:
  o FAT: kill nls default

Hugh Dickins:
  o install_page vs. vmtruncate
  o swapoff mmap_sem deadlock

Ingo Molnar:
  o NX: clean up legacy binary support

Jack Steiner:
  o ia64: Update function prototype for sn_io_addr
  o sched: initialize sched domain table

Jamal Hadi Salim:
  o [PKT_SCHED]: Fix pkt_cls.h incompatabilities

James Morris:
  o [CRYPTO]: Add i586 optimized AES

Jan Topinski:
  o Automatically disable laptop mode when battery almost runs out

Jeff Garzik:
  o [BK] Selectively ignore drivers/video/logo/*.c
  o [BK] Ignore build-generated files Module.symvers,
    drivers/net/wan/wanxlfw.inc

Jens Axboe:
  o BIO page refcounting fix
  o fix cdrom cdda rip single frame dma fall back
  o bio_copy_user() cleanups and fixes

Jesse Barnes:
  o ia64: make madt parsing quieter
  o ia64:  update sn2_defconfig to include new console
  o ia64: sn2 requires a 3.40 or better PROM
  o quieten down per-zone memory stats

Joel Schopp:
  o ppc64: cpu hotplug fix
  o ppc64 SMT bugfix

John Rose:
  o ppc64: struct pci_controller cleanup

Keith Owens:
  o ia64: Extend oem section types for SN mca records

Kenji Kaneshige:
  o ia64: fix bug in irq_affinity_write_proc()

Khalid Aziz:
  o ipmi_msghandler module load failure fix

Kornilios Kourtis:
  o kbuild: Two simple kbuild patches

Kumar Gala:
  o ppc32: reworked cpm alloc functions
  o ppc32: reworked CPM uart driver to work for properly for all CPMs
  o ppc32: Support for MPC8560 CPU and boards
  o ppc32: support for MPC8555 CPU and board
  o ppc32: fix e500 SPE saving of context

Linus Torvalds:
  o Make "install_page()" able to handle truncated pages
  o ppc64: fix more 0/NULL confusion
  o Linux 2.6.8-rc3

Luiz Capitulino:
  o remove dead code from copy_process()

Marcel Holtmann:
  o [Bluetooth] Add support for another ALPS module
  o [Bluetooth] Make use of usb_kill_urb()
  o [Bluetooth] Add missing entry for the HIDP support
  o [Bluetooth] Use a signed integer for the RSSI value
  o [Bluetooth] Replace BCSP retransmitting message with BT_DBG
  o [Bluetooth] Replace schedule_timeout() with msleep()
  o [Bluetooth] Send HCI_Reset for ISSC USB dongles
  o [Bluetooth] Fix resetting to default filters

Margit Schubert-While:
  o prism54 Fix reference to uninitialized pointer
  o prism54 Refix TRDY/RETRY_TIMEOUT
  o prism54 Fix initialization with older firmware
  o prism54 Fix null pointer reference (Bug 100)

Martin Schwidefsky:
  o s390: core changes

Masahide Nakamura:
  o [IPSEC]: xfrm_user code forgets to call xfrm_probe_algs()

Matt Porter:
  o ppc32: Fix PPC44x early uart setup
  o ppc32: export some DMA API symbols

Maximilian Attems:
  o drivers/macintosh/macserial.c MIN/MAX removal

Mika Kukkonen:
  o sign fix in swapfile.c

Mikael Pettersson:
  o [PATCH 1/1]: net/sunrpc/xprt.c gcc341 inlining fix

Miles Bader:
  o v850: Define find_first_bit

Nathan Lynch:
  o fixes for rcu_offline_cpu, rcu_move_batch

Nicolas Kaiser:
  o ppc32: fix comment in arch/ppc/platforms/pmac_pci.c

Olaf Hering:
  o ppc32: snd-powermac requires i2c
  o mark swim3 floppy controller as removable device

Oleg Nesterov:
  o populate nonlinear mappings unconditionally
  o hugetlbfs vm_pgoff bugs

Pat Gefre:
  o sn_console.c

Pat LaVarre:
  o SATAPI despite no data

Patrick McHardy:
  o [PKT_SCHED]: Remove dead timer code
  o [PKT_SCHED]: Use get_cycles() for PSCHED_CPU clock source
  o [PKT_SCHED]: Make clock source configurable
  o [IPV4/IPV6]: Add myself to MAINTAINERS
  o [XFRM]: Wake up km_waitq once per gc-run instead of once per state
  o [NET]: Remove useless variable in rtnetlink_rcv_msg

Paul Mackerras:
  o ppc64: Fix RAS irq handlers
  o ppc64: whitespace cleanup in prom.c
  o ppc64: ISA device tree node refcount fix
  o ppc64: improve SLB reload
  o PPC8xx Maintainer patch

Pavel Machek:
  o radeonfb x86_64 fix
  o swsusp: documentation update

Pawel Sikora:
  o fdomain_cs needs ISA

Robin Holt:
  o bte_error.c

Roland Dreier:
  o Export all functions in lib/string.c
  o MSI: stop using dev->bus->ops directly in msi.c

Russell King:
  o cirrusfb: discarded in section `.exit.text' from drivers/built-in.o

Sam Ravnborg:
  o kbuild: Rebuild .spec file when kernel version changes
  o kbuild: Less intrusive LANG override, fixes menuconfig
  o kbuild: Fix up moving of modpost
  o drivers: move STANDALONE to drivers/base/Kconfig
  o kbuild: Create Makefile in output directory if != kernel tree
  o kbuild: Introduce source symlink in /lib/modules/.../

Samuel Thibault:
  o [UDP]: Return true length if user specifies MSG_TRUNC

Sridhar Samudrala:
  o [SCTP] Set/Get default SCTP_PEER_ADDR_PARAMS for endpoint when
    associd and peer address are 0.
  o [SCTP] Fix data not being delivered to user in SHUTDOWN_SENT state
  o [SCTP] Fix issues with handling stale cookie error over multihoming
    associations.
  o [SCTP] Use idr_get_new_above() with a starting id of 1 to avoid
    returning an associd of 0.
  o [SCTP] Fix missing '+' in the computation of sack chunk size in
    sctp_sm_pull_sack().
  o [SCTP] Mark chunks as ineligible for fast retransmit after they are
    retransmitted. Also mark any chunks that could not be fit in the
    PMTU sized packet as ineligible for fast retransmit.

Srivatsa Vaddagiri:
  o ppc64: Fix cpu_up race

Stephen D. Smalley:
  o selinux: fix clearing of new personality bit on security
    transitions

Stephen Hemminger:
  o [PKT_SCHED]: Make sch_netem classful
  o [PKT_SCHED]: Missing qdisc destroy in sch_netem
  o [PKT_SCHED]: Need delayed packet limit in sch_netem
  o [IPV6]: Missing sparse annotation in addrconf
  o [IPVS]: Convert to module_param
  o [NET]: eql sparse cleanup
  o [PKT_SCHED]: de-inline qdiscipline locking functions
  o [NET]: Kill rtnl_exlock stubs
  o [NET]: Convert ethertap to use module_param
  o [NET]: Convert pktgen to use module_param
  o hlist_for_each_safe cleanup
  o [BRIDGE]: Propagate bridge internal MTU changes
  o [BRIDGE]: dev_xmit cleanup
  o [BRIDGE]: linkstate handling
  o [BRIDGE]: forwarding table RCU
  o [BRIDGE]: RCU fix
  o [NET]: Convert ROSE to use module_param
  o [NET]: Convert netrom to use module_param
  o [TCP]: BIC tcp congestion calculation timestamp

Steve Dickson:
  o nsf4 oops fixes

Steve French:
  o CIFS: Add missing mount option for optionally cifs perm checks when
    uids on server and client do not match and for optionally
    overriding server setting default uid/gid of new cifs files and
    directories.
  o [CIFS] remove unneeded, unused prototypes.  Suggested by Carl
    Spalletta
  o [CIFS] xattr suport part 2: add listxattr support
  o [CIFS] xattr support part 3 add query EA support to retrieve
    individual xattr values
  o [CIFS] xattr support part 4   add set EA support
  o [CIFS] xattr support for cifs filesystem part 5 of 5, add
    removexattr capability
  o [CIFS] Resize cifs request buffer mempools as tcp sessions are
    added to avoid potential deadlocks
  o [CIFS] fix smb return code
  o [CIFS] remove sparse pointer warning
  o [CIFS] Update readme and todo lists for cifs vfs

Stéphane Eranian:
  o ia64: fix perfmon bug that could result in kernel hang
  o fix for buffer limit for long in sysctl.c

Tim Schmielau:
  o Fix BSD accounting cross-platform compatibility

Tom 'spot' Callaway:
  o [SPARC]: Fix copy_user.S with gcc 3.3
  o [SPARC]: Add pci_dma_mapping_error to pci.h

Tom L. Nguyen:
  o MSI: MSI/MSI-X API updates

Tom Rini:
  o PPC32: Typo fix in m8xx serial driver
  o PPC32: Finish support for the EmbeddedPlanet RPX8260 board
  o ppc32: add gcc-3.4+binutils-2.14 check
  o ppc32: fix compilation with binutils-2.15

Tommi Virtanen:
  o [BRIDGE]: Fix typo in br_stp.c

Ursula Braun-Krahl:
  o s390: network driver changes

Willem Riede:
  o MAINTAINERS: update mailing list for osst

William Lee Irwin III:
  o [SPARC32]: Mark William Lee Irwin III as maintainer

Zwane Mwaikambo:
  o Recommend 'noapic' when timer via IOAPIC fails

Re: Linux 2.6.8-rc3

[Jan De Luyck]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wednesday 04 August 2004 00:09, Linus Torvalds wrote:
> Tons of small fixes all around the tree.
>
> There's an optimized assembly AES implementation for x86 (from Brian
> Gladman), and a number of driver updates, all of which are reasonably
> minor.
>
> It would be good if people only sent serious stuff for a while, and we can
> do a real 2.6.8, ok?
>
> 		Linus

Works like a charm, only one comment:

Mounting my vfat partitions gave me this error:

FAT: codepage or iocharset option didn't specified
     File name can not access proper (mounted as read-only)

which was easily fixed by supplying a iocharset= mount option. But according 
to the man page of mount:

       iocharset=value
              Character set to use for converting between 8 bit characters and
              16 bit Unicode characters. The default is iso8859-1.  Long file-
              names are stored on disk in Unicode format.

the default is iso8859-1. Has this default gone haywire somewhere?

Thanks anyway for another great kernel :)

Jan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)

iD8DBQFBENGKUQQOfidJUwQRApCPAJ9cJC0fZDmRlzmmyJT5372gMK1FmACePEy2
mxQyIW3/SQBA7deQBBwjMX0=
=7cdD
-----END PGP SIGNATURE-----

Re: Linux 2.6.8-rc3

[Karol Kozimor]

On Wednesday 04 of August 2004 14:07, Jan De Luyck wrote:

> the default is iso8859-1. Has this default gone haywire somewhere?

See this: http://linux.bkbits.net:8080/linux-2.5/cset%40410eabbemzleeiL5YJthKiBynrHGEA?nav=index.html|ChangeSet@-4d

Re: Linux 2.6.8-rc3

[Erik Mouw]

On Wed, Aug 04, 2004 at 02:07:20PM +0200, Jan De Luyck wrote:
> On Wednesday 04 August 2004 00:09, Linus Torvalds wrote:
> > It would be good if people only sent serious stuff for a while, and we can
> > do a real 2.6.8, ok?
> 
> Works like a charm, only one comment:
> 
> Mounting my vfat partitions gave me this error:
> 
> FAT: codepage or iocharset option didn't specified
>      File name can not access proper (mounted as read-only)
> 
> which was easily fixed by supplying a iocharset= mount option. But according 
> to the man page of mount:
> 
>        iocharset=value
>               Character set to use for converting between 8 bit characters and
>               16 bit Unicode characters. The default is iso8859-1.  Long file-
>               names are stored on disk in Unicode format.
> 
> the default is iso8859-1. Has this default gone haywire somewhere?

Yes, it's in the hidden in the ChangeLog. You can find it if you know
iocharset is the same as nls:

  Hirofumi Ogawa:
    o FAT: kill nls default


Erik

-- 
+-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 --
| Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands

Re: Linux 2.6.8-rc3

[OGAWA Hirofumi]

Erik Mouw <erik@harddisk-recovery.com> writes:

> >        iocharset=value
> >               Character set to use for converting between 8 bit characters and
> >               16 bit Unicode characters. The default is iso8859-1.  Long file-
> >               names are stored on disk in Unicode format.
> > 
> > the default is iso8859-1. Has this default gone haywire somewhere?
> 
> Yes, it's in the hidden in the ChangeLog. You can find it if you know
> iocharset is the same as nls:
> 
>   Hirofumi Ogawa:
>     o FAT: kill nls default

Or Documentation/filesystems/vfat.txt
-- 
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

Re: Linux 2.6.8-rc3

[szonyi calin]

 --- OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> a écrit : 
> Erik Mouw <erik@harddisk-recovery.com> writes:
> 
> > >        iocharset=value
> > >               Character set to use for converting between
> 8 bit characters and
> > >               16 bit Unicode characters. The default is
> iso8859-1.  Long file-
> > >               names are stored on disk in Unicode format.
> > > 
> > > the default is iso8859-1. Has this default gone haywire
> somewhere?
> > 
> > Yes, it's in the hidden in the ChangeLog. You can find it if
> you know
> > iocharset is the same as nls:
> > 
> >   Hirofumi Ogawa:
> >     o FAT: kill nls default
> 
> Or Documentation/filesystems/vfat.txt

kernel says

FAT: codepage or iocharset option didn't specified
     File name can not access proper (mounted as read-only)

codepage *is* specified:
my fstab line for mounting the vfat filesystem is:
/dev/hda1       /mnt/dosc        vfat       
defaults,user,uid=100,gid=100,codepage=437         1   0

So the message is not correct ;-)
specifying iocharset works.

Bye
Calin

--
Yesterday it worked
today isn't working
windows is like that 


	

	
		
Vous manquez d’espace pour stocker vos mails ? 
Yahoo! Mail vous offre GRATUITEMENT 100 Mo !
Créez votre Yahoo! Mail sur http://fr.benefits.yahoo.com/

Le nouveau Yahoo! Messenger est arrivé ! Découvrez toutes les nouveautés pour dialoguer instantanément avec vos amis. A télécharger gratuitement sur http://fr.messenger.yahoo.com

Re: Linux 2.6.8-rc3

[Gene Heskett]

On Wednesday 04 August 2004 08:07, Jan De Luyck wrote:
>-----BEGIN PGP SIGNED MESSAGE-----
>Hash: SHA1
>
>On Wednesday 04 August 2004 00:09, Linus Torvalds wrote:
>> Tons of small fixes all around the tree.
>>
>> There's an optimized assembly AES implementation for x86 (from
>> Brian Gladman), and a number of driver updates, all of which are
>> reasonably minor.
>>
>> It would be good if people only sent serious stuff for a while,
>> and we can do a real 2.6.8, ok?
>>
>> 		Linus
>
>Works like a charm, only one comment:
>
>Mounting my vfat partitions gave me this error:
>
>FAT: codepage or iocharset option didn't specified
>     File name can not access proper (mounted as read-only)
>
>which was easily fixed by supplying a iocharset= mount option. But
> according to the man page of mount:
>
>       iocharset=value
>              Character set to use for converting between 8 bit
> characters and 16 bit Unicode characters. The default is iso8859-1.
>  Long file- names are stored on disk in Unicode format.
>
>the default is iso8859-1. Has this default gone haywire somewhere?
>
>Thanks anyway for another great kernel :)
>
>Jan

I too seem to have a font problem in the early boot, I have nothing 
but some flashing as the cursor moves back and forth from kernel 
unpack to the line where it reports setting the default font, at 
which time the screen comes alive and is then readable as the boot 
continues.  This font setup occurs about 4 or 5 lines before the init 
signs on.  This condition has existed since someplace around 2.6.6 
here.  I have the 3 normally used for western english fonts compiled 
in too.  437, iso8859-1, and utf-8.

-- 
Cheers, Gene
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
99.24% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attorneys please note, additions to this message
by Gene Heskett are:
Copyright 2004 by Maurice Eugene Heskett, all rights reserved.

Re: Linux 2.6.8-rc3

[Juergen Stuber]

Linus Torvalds <torvalds@osdl.org> writes:
>[...]
>   o depends on PCI DMA API: Cisco/Aironet 34X/35X/4500/4800

I guess it is this change that made the Airo driver disappear for me,
because I didn't have ISA configured:

--- linux-2.6.8-rc2/drivers/net/wireless/Kconfig        2004-07-18 06:57:48.000000000 +0200
+++ linux-2.6.8-rc3/drivers/net/wireless/Kconfig        2004-08-03 23:27:14.000000000 +0200
@@ -139,7 +139,7 @@
 
 config AIRO
        tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
-       depends on NET_RADIO && (ISA || PCI)
+       depends on NET_RADIO && ISA && (PCI || BROKEN)
        ---help---
          This is the standard Linux driver to support Cisco/Aironet ISA and
          PCI 802.11 wireless cards.


If I understand it correctly the logic is faulty and should better be

       depends on NET_RADIO && ((ISA && BROKEN) || PCI)


Jürgen

-- 
Jürgen Stuber <juergen@jstuber.net>
http://www.jstuber.net/
gnupg key fingerprint = 2767 CA3C 5680 58BA 9A91  23D9 BED6 9A7A AF9E 68B4

Re: Linux 2.6.8-rc3

[Geert Uytterhoeven]

On Wed, 4 Aug 2004, Juergen Stuber wrote:
> Linus Torvalds <torvalds@osdl.org> writes:
> >[...]
> >   o depends on PCI DMA API: Cisco/Aironet 34X/35X/4500/4800
>
> I guess it is this change that made the Airo driver disappear for me,
> because I didn't have ISA configured:
>
> --- linux-2.6.8-rc2/drivers/net/wireless/Kconfig        2004-07-18 06:57:48.000000000 +0200
> +++ linux-2.6.8-rc3/drivers/net/wireless/Kconfig        2004-08-03 23:27:14.000000000 +0200
> @@ -139,7 +139,7 @@
>
>  config AIRO
>         tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
> -       depends on NET_RADIO && (ISA || PCI)
> +       depends on NET_RADIO && ISA && (PCI || BROKEN)
>         ---help---
>           This is the standard Linux driver to support Cisco/Aironet ISA and
>           PCI 802.11 wireless cards.
>
>
> If I understand it correctly the logic is faulty and should better be
>
>        depends on NET_RADIO && ((ISA && BROKEN) || PCI)

Sorry, my fault. Yep, that sounds better.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: Linux 2.6.8-rc3

[Jari Ruusu]

Linus Torvalds wrote:
> Summary of changes from v2.6.8-rc2 to v2.6.8-rc3
[snip]
> James Morris:
>   o [CRYPTO]: Add i586 optimized AES

My work on aes-i586.S is only licensed under original three clause BSD
license. You do not have my permission to change the license.

Either use original license or drop this code.

-- 
Jari Ruusu  1024R/3A220F51 5B 4B F9 BB D3 3F 52 E9  DB 1D EB E3 24 0E A9 DD

Re: Linux 2.6.8-rc3

[James Morris]

On Wed, 4 Aug 2004, Jari Ruusu wrote:

> Linus Torvalds wrote:
> > Summary of changes from v2.6.8-rc2 to v2.6.8-rc3
> [snip]
> > James Morris:
> >   o [CRYPTO]: Add i586 optimized AES
> 
> My work on aes-i586.S is only licensed under original three clause BSD
> license. You do not have my permission to change the license.
> 
> Either use original license or drop this code.

Can you assert licensing restrictions which override the original author's
(Brian Gladman)?  I don't know the answer, just asking.


- James
-- 
James Morris
<jmorris@redhat.com>

Re: Linux 2.6.8-rc3

[J. Bruce Fields]

On Wed, Aug 04, 2004 at 12:00:26PM -0400, James Morris wrote:
> On Wed, 4 Aug 2004, Jari Ruusu wrote:
> 
> > Linus Torvalds wrote:
> > > Summary of changes from v2.6.8-rc2 to v2.6.8-rc3
> > [snip]
> > > James Morris:
> > >   o [CRYPTO]: Add i586 optimized AES
> > 
> > My work on aes-i586.S is only licensed under original three clause BSD
> > license. You do not have my permission to change the license.
> > 
> > Either use original license or drop this code.
> 
> Can you assert licensing restrictions which override the original author's
> (Brian Gladman)?  I don't know the answer, just asking.

Well, the license is an "or", so you're free to create derived works
under either or both licenses as you prefer.

But I don't even see why it's an issue; every source I've ever seen
seems to agree that the two are compatible, so you're always free to
relicense under 3-clause BSD under BSD or GPL anyway.  So, unless I'm
missing something, the "or GPL" probably doesn't do anything more than
make explicit something that was allowed already.

--Bruce Fields

Re: Linux 2.6.8-rc3

[Arjan van de Ven]

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]


> relicense under 3-clause BSD under BSD or GPL anyway.  So, unless I'm
> missing something, the "or GPL" probably doesn't do anything more than
> make explicit something that was allowed already.

not entirely; in a dual license scheme one has the freedom to ignore one
of the two licenses and also to place derived work only under the one
chosen. That and it's outright rude to take someone else's code and
relicense it.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: Linux 2.6.8-rc3

[Patrick McFarland]

On Wed, 04 Aug 2004 18:27:30 +0200, Arjan van de Ven <arjanv@redhat.com> wrote:
> not entirely; in a dual license scheme one has the freedom to ignore one
> of the two licenses and also to place derived work only under the one
> chosen. That and it's outright rude to take someone else's code and
> relicense it.

So will 2.6.8-rc4 be released with no optimized aes, or with a saner
optimized aes?

-- 
Patrick "Diablo-D3" McFarland || diablod3@gmail.com
"Computer games don't affect kids; I mean if Pac-Man affected us as kids, we'd 
all be running around in darkened rooms, munching magic pills and listening to
repetitive electronic music." -- Kristian Wilson, Nintendo, Inc, 1989

Re: Linux 2.6.8-rc3

[Linus Torvalds]

On Wed, 4 Aug 2004, Patrick McFarland wrote:
> 
> So will 2.6.8-rc4 be released with no optimized aes, or with a saner
> optimized aes?

We'll see just how quickly somebody steps up to the plate. I spent some
time taking the original Gladman source into gas format, and have a really
ugly (untested) direct conversion if somebody wants to work on it.

Side note: Jari Ruusu has himself been distributing the code he now 
objects to as part of his own linux kernel loop-aes patches. From the 
loop-aes README:

	Copyright 2001,2002,2003,2004 by Jari Ruusu.
	Redistribution of this file is permitted under the GNU Public License.

But the original x86 assembler code that is part of that loop-aes patch
was copyright Dr Brian Gladman, and was NOT originally under the GPL, so
it was Jari Ruusu who originally did something very suspect from a
copyright angle. Now he claims he never wanted to GPL it, but the fact is,
he's been distributing kernel patches with the code for a long time, and
claiming it is GPL'd.

So then David and James wanted to include it into the kernel as part of
the standard encryption layer, and I said no, since I felt the copyright
wasn't clear. So James asked Dr Gladman for permission to dual-license
under the GPL, and got it. So I was happy.

Now Jari Ruusu comes along and starts complaining about things. 

Jari: mitä helvetin järkeä tuossa on? Selitä.

		Linus

Re: Linux 2.6.8-rc3

[Patrick McFarland]

On Wed, 4 Aug 2004 11:45:12 -0700 (PDT), Linus Torvalds
<torvalds@osdl.org> wrote:
> Side note: Jari Ruusu has himself been distributing the code he now
> objects to as part of his own linux kernel loop-aes patches. From the
> loop-aes README:
> 
>         Copyright 2001,2002,2003,2004 by Jari Ruusu.
>         Redistribution of this file is permitted under the GNU Public License.
> 
> But the original x86 assembler code that is part of that loop-aes patch
> was copyright Dr Brian Gladman, and was NOT originally under the GPL, so
> it was Jari Ruusu who originally did something very suspect from a
> copyright angle. Now he claims he never wanted to GPL it, but the fact is,
> he's been distributing kernel patches with the code for a long time, and
> claiming it is GPL'd.
> 
> So then David and James wanted to include it into the kernel as part of
> the standard encryption layer, and I said no, since I felt the copyright
> wasn't clear. So James asked Dr Gladman for permission to dual-license
> under the GPL, and got it. So I was happy.
> 
> Now Jari Ruusu comes along and starts complaining about things.

So, I'm confused. David, James, and Brian all have GPL code, and Jari
has distributed his code with other GPL code (1) and labled his own
code as GPL (2) even though hes complaining about it (3) being in the
kernel without his permission, right?

1) Doesn't this make his code GPL as well?
2) If #1 doesn't, doesn't this?
3) If #1 or #2 make his code GPL, then he isn't allowed to revoke our
right to use GPL code written by him, right?

If I've missed something, please tell me. Im also confused why anyone
_wouldn't_ want their code in the kernel; I consider it a great honor
to have a patch accepted with my code in it, etc.

-- 
Patrick "Diablo-D3" McFarland || diablod3@gmail.com
"Computer games don't affect kids; I mean if Pac-Man affected us as kids, we'd 
all be running around in darkened rooms, munching magic pills and listening to
repetitive electronic music." -- Kristian Wilson, Nintendo, Inc, 1989

Re: Linux 2.6.8-rc3

[H. Peter Anvin]

Followup to:  <1091636850.2792.19.camel@laptop.fenrus.com>
By author:    Arjan van de Ven <arjanv@redhat.com>
In newsgroup: linux.dev.kernel
> 
> > relicense under 3-clause BSD under BSD or GPL anyway.  So, unless I'm
> > missing something, the "or GPL" probably doesn't do anything more than
> > make explicit something that was allowed already.
> 
> not entirely; in a dual license scheme one has the freedom to ignore one
> of the two licenses and also to place derived work only under the one
> chosen.
> 

The BSD license allows you to do that anyway.

> That and it's outright rude to take someone else's code and
> relicense it.

Rude, yes; that of course makes a lot of companies which have done
this with BSD very rude :)

	-hpa

Re: Linux 2.6.8-rc3 - BSD licensing

[Fruhwirth Clemens]

[-- Attachment #1: Type: text/plain, Size: 2307 bytes --]

On Wed, 2004-08-04 at 18:00, James Morris wrote:
> On Wed, 4 Aug 2004, Jari Ruusu wrote:
> 
> > Linus Torvalds wrote:
> > > Summary of changes from v2.6.8-rc2 to v2.6.8-rc3
> > [snip]
> > > James Morris:
> > >   o [CRYPTO]: Add i586 optimized AES
> > 
> > My work on aes-i586.S is only licensed under original three clause BSD
> > license. You do not have my permission to change the license.
> > 
> > Either use original license or drop this code.
> 
> Can you assert licensing restrictions which override the original author's
> (Brian Gladman)?  I don't know the answer, just asking.

Short: override no; add yes.

Long:
The BSD license starts with[1]:
''Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:''

The conditions followed by that sentence are compatible with the GPL
(legally), but the GPL does not include a verbatim copy of those
conditions, therefor these conditions must not be stripped. Thus, the
''instead of'' clause, added below the BSD conditions, is invalid for
sure.

However, I could add additional conditions to the list. If you reread
[1] carefully you will come to the conclusion that adding restrictions
does not affect the 3-clauses and therefor is legal to do (imagine this
as a series of logical ANDs). That's exactly the reason the FSF calls
BSD permissive and that's the reason Microsoft has used the BSD TCP/IP
stack.

As a matter of principle I do not add additional restrictions as respect
for the original author's efforts. But James, David or Linus might do
that, and by accident choose these additional restrictions to be like
those of the GPL. I would understand such action as I'd would like to
see that every kernel code is protected by the GPL.

The impotent difference is, the code is not GPL only. It's Dual BSD/GPL.
('/' does not mean OR). As the BSD license is effectively a legal subset
of the GPL, the GPL is the dominant and defining license here. At the
end that's all we want.

I advise to replace the ALTERNATIVELY paragraph of aes-i586.S by:
''Additionally all provisions of the GNU General Public License (GPL)
must be met''. 

-- 
Fruhwirth Clemens <clemens@endorphin.org>  http://clemens.endorphin.org

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: Linux 2.6.8-rc3 - BSD licensing

[Linus Torvalds]

On Wed, 4 Aug 2004, Fruhwirth Clemens wrote:
> 
> As a matter of principle I do not add additional restrictions as respect
> for the original author's efforts. But James, David or Linus might do
> that, and by accident choose these additional restrictions to be like
> those of the GPL. I would understand such action as I'd would like to
> see that every kernel code is protected by the GPL.

That's not actually what we did. I refused the code originally because I
didn't feel that Gladman's license was a proper subset of the GPL. I only
accepted it after dual-licensing under the GPL had been ok'd by Dr Brian
Gladman himself.

Note that the kernel is perfectly fine with dual-licensing: there's a
number of drivers in the kernel that can be distributed either under BSD
or GPL licenses. I hate adding restrictions too, so when we have a mix of
licenses, I much prefer allowing _both_ for that piece of code. That's why 
the current aes-i586-asm.S file has

//  ALTERNATIVELY, provided that this notice is retained in full, this product
//  may be distributed under the terms of the GNU General Public License (GPL),
//  in which case the provisions of the GPL apply INSTEAD OF those given above.

Of course, the kernel itself always uses the GPL version, but dual
licensing is how we can allow certain drivers to be maintained across
Linux and the BSD's (or other projects, for that matter). No need to 
duplicate work that way.

		Linus

Re: Linux 2.6.8-rc3 - BSD licensing

[Fruhwirth Clemens]

[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]

On Wed, 2004-08-04 at 20:51, Linus Torvalds wrote:
> On Wed, 4 Aug 2004, Fruhwirth Clemens wrote:
> > 
> > As a matter of principle I do not add additional restrictions as respect
> > for the original author's efforts. But James, David or Linus might do
> > that, and by accident choose these additional restrictions to be like
> > those of the GPL. I would understand such action as I'd would like to
> > see that every kernel code is protected by the GPL.
> 
> That's not actually what we did. I refused the code originally because I
> didn't feel that Gladman's license was a proper subset of the GPL. 

I don't view the FSF as sort of last instance, but just for the
protocol: The exact wording of this license is labeled 'GPL-compatible'
by the FSF. Imho, this makes it a subset.

> I only accepted it after dual-licensing under the GPL had been ok'd by Dr Brian
> Gladman himself.

Additional coding, no problem, but additional social work, I'd prefer
not to be involved with. As there is no legal requirement, such efforts
would just make a good appearance. But, hey, if someone volunteers to
sort out these problems, my modifications to aes-i586.S can be
relicensed under the GPL anytime, no problem.

-- 
Fruhwirth Clemens <clemens@endorphin.org>  http://clemens.endorphin.org

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: Linux 2.6.8-rc3 - BSD licensing

[Linus Torvalds]

On Wed, 4 Aug 2004, Fruhwirth Clemens wrote:
> 
> I don't view the FSF as sort of last instance, but just for the
> protocol: The exact wording of this license is labeled 'GPL-compatible'
> by the FSF. Imho, this makes it a subset.

Ahh. Fair enough. I didn't have any lawyer look at it, I just don't like 
assuming.

> Additional coding, no problem, but additional social work, I'd prefer
> not to be involved with. As there is no legal requirement, such efforts
> would just make a good appearance.

I'd much rather do the social work, not so much necessarily for legal 
reasons, but for my own menal well-being. It's just _so_ much nicer to 
work with a code-base where none of the authors might complain about being 
included.

So even if the original license is GPL-compatible, just the fact that Jari 
doesn't want his work re-licensed means that I don't want his work in the 
kernel - whether it's a legal issue or not. 

Now, I obviously believe that Jari has acted like an ass, since he has
used the very same code under the GPL before, but hey, that's his problem. 

Jari - please stop distributing your loop-aes patches. If you consider the 
license to be non-GPL-compatible, then you have no business distributing 
the thing as kernel patches. Alternatively, just say it's GPL'd. You can't 
have it both ways.

		Linus

Re: Linux 2.6.8-rc3 - BSD licensing

[Jari Ruusu]

Linus Torvalds wrote:
> Now, I obviously believe that Jari has acted like an ass, since he has
> used the very same code under the GPL before, but hey, that's his problem.

Linus, are you saying that anyone who refuses to re-license their work under
license of your choice, is an ass? Or just the ones who catch you
re-licencing their work without permission?

> Jari - please stop distributing your loop-aes patches. If you consider the
> license to be non-GPL-compatible, then you have no business distributing
> the thing as kernel patches. Alternatively, just say it's GPL'd. You can't
> have it both ways.

I say that loop-AES is GPL-compatible.

Most of the files in loop-AES are licensed under GPL. Some files have less
restrictive license, but are still licensed under GPL-compatible license.
I am not aware of any files in loop-AES that are GPL-incompatible.

-- 
Jari Ruusu  1024R/3A220F51 5B 4B F9 BB D3 3F 52 E9  DB 1D EB E3 24 0E A9 DD

Re: Linux 2.6.8-rc3 - BSD licensing

[Linus Torvalds]

On Thu, 5 Aug 2004, Jari Ruusu wrote:
> 
> Most of the files in loop-AES are licensed under GPL. Some files have less
> restrictive license, but are still licensed under GPL-compatible license.
> I am not aware of any files in loop-AES that are GPL-incompatible.

You're saying that you consider Gladman's original AES license to be
GPL-compatible (ie a subset of it)? That's fine - apparently the FSF
agrees.

However, that is incompatible with you then complaining when it gets 
released under the GPL. If the original license was a proper subset of the 
GPL, then it can _always_ be re-released under the GPL, and you don't have 
anything to complain about.

So which is it? Either it's GPL-compatible or it isn't. If it is
GPL-compatible, why are you making noises? And if it is not, why are you
claiming that you can distribute loop-AES as a GPL'd project?

You seem to be very very confused, Jari. There really _are_ only these two 
cases:

 - the AES code is GPL-compatible

   This fundamentally means that it has no more restrictions than the GPL, 
   and that in turn means that it can always be re-licensed as GPL'd code. 
   Which James Morris did (well, it was dual-licensed, but the only 
   license that matters for the _kernel_ is the GPL).

   In this case, you can't say "you can't do that". I'm sorry, but James 
   _can_ do that, and it is _you_ who can't do that. 

 - the AES code is _not_ GPL compatible.

   This fundamentally means that you can't relicense it under the GPL, but 
   it _also_ means that you can't link it with GPL code, since the GPL
   _requires_ that the code be under the GPL. In this case, loop-AES was 
   always wrogn and lying about beign GPL'd, and you should stop
   distributing it immediately.

You can't have it both ways. And there aren't any third alternatives.

Explain yourself.

		Linus

Re: Linux 2.6.8-rc3 - BSD licensing

[Måns Rullgård]

Linus Torvalds <torvalds@osdl.org> writes:

> On Thu, 5 Aug 2004, Jari Ruusu wrote:
>> 
>> Most of the files in loop-AES are licensed under GPL. Some files
>> have less restrictive license, but are still licensed under
>> GPL-compatible license.  I am not aware of any files in loop-AES
>> that are GPL-incompatible.
>
> You're saying that you consider Gladman's original AES license to be
> GPL-compatible (ie a subset of it)? That's fine - apparently the FSF
> agrees.
>
> However, that is incompatible with you then complaining when it gets 
> released under the GPL. If the original license was a proper subset of the 
> GPL, then it can _always_ be re-released under the GPL, and you don't have 
> anything to complain about.
>
> So which is it? Either it's GPL-compatible or it isn't. If it is
> GPL-compatible, why are you making noises? And if it is not, why are you
> claiming that you can distribute loop-AES as a GPL'd project?
>
> You seem to be very very confused, Jari. There really _are_ only these two 
> cases:
>
>  - the AES code is GPL-compatible
>
>    This fundamentally means that it has no more restrictions than the GPL, 
>    and that in turn means that it can always be re-licensed as GPL'd code. 
>    Which James Morris did (well, it was dual-licensed, but the only 
>    license that matters for the _kernel_ is the GPL).
>
>    In this case, you can't say "you can't do that". I'm sorry, but James 
>    _can_ do that, and it is _you_ who can't do that. 
>
>  - the AES code is _not_ GPL compatible.
>
>    This fundamentally means that you can't relicense it under the GPL, but 
>    it _also_ means that you can't link it with GPL code, since the GPL
>    _requires_ that the code be under the GPL. In this case, loop-AES was 
>    always wrogn and lying about beign GPL'd, and you should stop
>    distributing it immediately.
>
> You can't have it both ways. And there aren't any third alternatives.

I can think of one more:

Assuming that the AES code is not in itself considered derived from
the kernel, I see nothing preventing the source file in the kernel
tree carrying a BSD license.  Obviously, when used with the kernel the
GPL will apply, but anyone would be free to take the AES code and
reuse it under the BSD license.  If, on the other hand, the AES source
in the kernel only carries a GPL license tag, someone looking at it
will not be aware that the code is (possibly) available with less
restrictions form another source.

Anyone who has as a goal to see the GPL cover all code on the planet
will obviously prefer placing the file under the GPL only wherever he
can.  Legally, though, there should be nothing prohibiting a single
file in the Linux tree with a more permissive license.

IANAL, so please correct me if I am fundamentally wrong somewhere.

-- 
Måns Rullgård
mru@kth.se

Re: Linux 2.6.8-rc3 - BSD licensing

[Alan Cox]

On Iau, 2004-08-05 at 18:45, Måns Rullgård wrote:
> Assuming that the AES code is not in itself considered derived from
> the kernel, I see nothing preventing the source file in the kernel
> tree carrying a BSD license.  Obviously, when used with the kernel the
> GPL will apply, but anyone would be free to take the AES code and
> reuse it under the BSD license.  If, on the other hand, the AES source
> in the kernel only carries a GPL license tag, someone looking at it
> will not be aware that the code is (possibly) available with less
> restrictions form another source.

The random driver has an example of that kind of dual licensing made
explicit. Given code gets modified for the kernel maybe it would be
simpler to just give the URL of the original in the comments so everyone
else (who probably wants the original anyway) can grab it there.

Re: Linux 2.6.8-rc3 - BSD licensing

[Måns Rullgård]

Alan Cox <alan@lxorguk.ukuu.org.uk> writes:

> On Iau, 2004-08-05 at 18:45, Måns Rullgård wrote:
>> Assuming that the AES code is not in itself considered derived from
>> the kernel, I see nothing preventing the source file in the kernel
>> tree carrying a BSD license.  Obviously, when used with the kernel the
>> GPL will apply, but anyone would be free to take the AES code and
>> reuse it under the BSD license.  If, on the other hand, the AES source
>> in the kernel only carries a GPL license tag, someone looking at it
>> will not be aware that the code is (possibly) available with less
>> restrictions form another source.
>
> The random driver has an example of that kind of dual licensing made
> explicit. Given code gets modified for the kernel maybe it would be
> simpler to just give the URL of the original in the comments so everyone
> else (who probably wants the original anyway) can grab it there.

That doesn't make it any nicer to replace one license with another
without the author's permission.  Adding an explicit GPL is fine, the
BSD license allows that.  However, it also requires that the original
license remain in place.

-- 
Måns Rullgård
mru@kth.se

Re: Linux 2.6.8-rc3 - BSD licensing

[Alan Cox]

On Iau, 2004-08-05 at 22:37, Måns Rullgård wrote:
> > The random driver has an example of that kind of dual licensing made
> > explicit. Given code gets modified for the kernel maybe it would be
> > simpler to just give the URL of the original in the comments so everyone
> > else (who probably wants the original anyway) can grab it there.
> 
> That doesn't make it any nicer to replace one license with another
> without the author's permission.  Adding an explicit GPL is fine, the
> BSD license allows that.  However, it also requires that the original
> license remain in place.

The random driver says...

/*
 * random.c -- A strong random number generator
 *
 * Version 1.89, last modified 19-Sep-99
 *
 * Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All
 * rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, and the entire permission notice in its entirety,
 *    including the disclaimer of warranties.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in
the
 *    documentation and/or other materials provided with the
distribution.
 * 3. The name of the author may not be used to endorse or promote
 *    products derived from this software without specific prior
 *    written permission.
 *
 * ALTERNATIVELY, this product may be distributed under the terms of
 * the GNU General Public License, in which case the provisions of the
GPL are
 * required INSTEAD OF the above restrictions.  (This clause is
 * necessary due to a potential bad interaction between the GPL and
 * the restrictions contained in a BSD-style copyright.)
 *
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
 * WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
 * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
 * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 * USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
 * DAMAGE.
 */
 

Re: Linux 2.6.8-rc3 - BSD licensing

[Jari Ruusu]

Linus Torvalds wrote:
> You're saying that you consider Gladman's original AES license to be
> GPL-compatible (ie a subset of it)? That's fine - apparently the FSF
> agrees.

Yes, it is GPL-compatible.

> However, that is incompatible with you then complaining when it gets
> released under the GPL. If the original license was a proper subset of the
> GPL, then it can _always_ be re-released under the GPL, and you don't have
> anything to complain about.

Linus, you are mixing two completely different rights here; re-distribution
right and re-licensing right. Original license grants you GPL-compatible
re-distribution rights, which means that the code can be distributed and
linked with GPL code just fine. To relicense the code under more restrictive
license you need permission from all authors of the code. You clearly do not
have such permission from all authors. Therefore, you can not re-license the
code.

-- 
Jari Ruusu  1024R/3A220F51 5B 4B F9 BB D3 3F 52 E9  DB 1D EB E3 24 0E A9 DD

Re: Linux 2.6.8-rc3 - BSD licensing

[Linus Torvalds]

On Fri, 6 Aug 2004, Jari Ruusu wrote:
> 
> Linus, you are mixing two completely different rights here;
> re-distribution right and re-licensing right.

Ehh.. You're wrong.

Copyright law has nothing to do with "licensing". In fact, if you actually 
read copyright law, you will find that the _only_ thing that it's about is 
the right to distribute a work and the right to make derived works.

(Side note: there are also certain "right of attribution" etc, but that's
still not about re-licensing and those are about the author, not the owner
of the copyright).

In other words, being the "owner" of a work has nothing to do with the
right to "relicence".

Being able to license somebody else to distribute the work does NOT 
require ownership. It only requires a _license_ to do so. You can keep 
owning your copyright, and let somebody else distribute the copy for you 
by liccensing him to do that.

And a license like the BSD license that allows very broad rights to 
_everybody_ means that pretty much everybody can not only distribute it, 
but since the BSD license doesn't even limit how they re-distribute it, 
you can distribute it with some additional requirements of your own.

Why do you think Microsoft etc can take BSD code and then slap their EULA 
on it? Right. They were given the right to distribute. 

> Original license grants
> you GPL-compatible re-distribution rights, which means that the code can
> be distributed and linked with GPL code just fine.

You clearly do not know what you're talking about.

You haven't even read the GPL, have you?

The GPL doesn't say "you can link this with a GPL-compatible license". It 
says:

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

Notice? It says "this License". Not "this license or some more permissive 
license".

The ONLY license you can use to create a GPL derivative is the GPL itself.

And the way "GPL-compatible" licenses work is _exactly_ because these 
licenses are "weaker" than the GPL, and as such can always be _relicensed_ 
as the GPL.

THAT IS WHAT GPL-COMPATIBLE MEANS!

So when you claim that the code isn't GPL-compatible, and at the same time 
claim that we can't re-license it under the GPL, you are very very 
confused indeed. Either it is GPL-compatible, or it is not. And if it is 
GPL-compatible, that ABSOLUTELY means that it can be relicensed under the 
GPL.

Comprende?

Anyway, the point is moot.  We've removed the code you touched, and I'm
about to apply the new version that is based on Gladman's code (I did the
conversion myself, and James Morris did the final stuff and the
integration with the rest of the code).

And we did that not for legal reasons, but because quite frankly, I don't 
want to have _anything_ to do with somebody as confused as you are. 

			Linus

Re: Linux 2.6.8-rc3 - BSD licensing

[Jari Ruusu]

Linus Torvalds wrote:
> On Fri, 6 Aug 2004, Jari Ruusu wrote:
> > Linus, you are mixing two completely different rights here;
> > re-distribution right and re-licensing right.
> 
> Ehh.. You're wrong.

Yep. I goofed.

> You haven't even read the GPL, have you?

I read it in 1995. Obviously too many years have passed since then.

> So when you claim that the code isn't GPL-compatible, and at the same time
> claim that we can't re-license it under the GPL, you are very very
> confused indeed. Either it is GPL-compatible, or it is not. And if it is
> GPL-compatible, that ABSOLUTELY means that it can be relicensed under the
> GPL.

Yep. I don't have any other choice here than to permit re-licencing the
code. My 04-Aug-2004 18:04:46 +0300 posting where I denied re-licencing
right was completely wrong. I'm sorry about that.

For loop-AES users I uploaded a patch here that updates licenses to be
GPL-compatible:  http://loop-aes.sourceforge.net/updates/aes-GPL.diff

-- 
Jari Ruusu  1024R/3A220F51 5B 4B F9 BB D3 3F 52 E9  DB 1D EB E3 24 0E A9 DD

Re: Linux 2.6.8-rc3 - BSD licensing

[Patrick McFarland]

Ouch. I knew Linus was right all along. ;)
However, Jari, you can still request people not use your code in a not
legally enforcable way; and I'm sure Linus would have followed that
request. But thankfully, we can use your code, and it's just a moot
point.

On Sat, 07 Aug 2004 13:19:09 +0300, Jari Ruusu
<jariruusu@users.sourceforge.net> wrote:
> Linus Torvalds wrote:
> > On Fri, 6 Aug 2004, Jari Ruusu wrote:
> > > Linus, you are mixing two completely different rights here;
> > > re-distribution right and re-licensing right.
> >
> > Ehh.. You're wrong.
> 
> Yep. I goofed.
> 
> > You haven't even read the GPL, have you?
> 
> I read it in 1995. Obviously too many years have passed since then.
> 
> > So when you claim that the code isn't GPL-compatible, and at the same time
> > claim that we can't re-license it under the GPL, you are very very
> > confused indeed. Either it is GPL-compatible, or it is not. And if it is
> > GPL-compatible, that ABSOLUTELY means that it can be relicensed under the
> > GPL.
> 
> Yep. I don't have any other choice here than to permit re-licencing the
> code. My 04-Aug-2004 18:04:46 +0300 posting where I denied re-licencing
> right was completely wrong. I'm sorry about that.
> 
> For loop-AES users I uploaded a patch here that updates licenses to be
> GPL-compatible:  http://loop-aes.sourceforge.net/updates/aes-GPL.diff
> 
> 
> 
> --
> Jari Ruusu  1024R/3A220F51 5B 4B F9 BB D3 3F 52 E9  DB 1D EB E3 24 0E A9 DD
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 


-- 
Patrick "Diablo-D3" McFarland || diablod3@gmail.com
"Computer games don't affect kids; I mean if Pac-Man affected us as kids, we'd 
all be running around in darkened rooms, munching magic pills and listening to
repetitive electronic music." -- Kristian Wilson, Nintendo, Inc, 1989

Re: Linux 2.6.8-rc3 - BSD licensing

[Linus Torvalds]

On Sat, 7 Aug 2004, Jari Ruusu wrote:
> > 
> > Ehh.. You're wrong.
> 
> Yep. I goofed.

Hey, Welcome back, Jari.

It's easy to be wrong. It's much harder to come out and say so.

Let's leave this spat behind us. Friends?

		Linus

Re: Linux 2.6.8-rc3

[Jari Ruusu]

James Morris wrote:
> Can you assert licensing restrictions which override the original author's
> (Brian Gladman)?  I don't know the answer, just asking.

Brian Gladman is free to license his code any way he wants. But he needs my
permission to re-licence my work and my optimizations.

-- 
Jari Ruusu  1024R/3A220F51 5B 4B F9 BB D3 3F 52 E9  DB 1D EB E3 24 0E A9 DD

Re: Linux 2.6.8-rc3

[Linus Torvalds]

On Wed, 4 Aug 2004, Jari Ruusu wrote:
>
> Linus Torvalds wrote:
> > Summary of changes from v2.6.8-rc2 to v2.6.8-rc3
> [snip]
> > James Morris:
> >   o [CRYPTO]: Add i586 optimized AES
> 
> My work on aes-i586.S is only licensed under original three clause BSD
> license. You do not have my permission to change the license.
> 
> Either use original license or drop this code.

We'll drop it immediately. It should be easy enough to get somebody saner 
than you to re-convert from the original AES code which is dual-GPL'd.

		Linus

[PATCH] Drop asm i586 AES code.

[James Morris]

This patch reverts the i586 AES module.  A new one should be ready soon.

Signed-off-by: James Morris <jmorris@redhat.com>


diff -urN -X dontdiff linux-2.6.8-rc3.o/arch/i386/crypto/aes-i586-asm.S linux-2.6.8-rc3.w2/arch/i386/crypto/aes-i586-asm.S
--- linux-2.6.8-rc3.o/arch/i386/crypto/aes-i586-asm.S	2004-08-04 19:43:16.000000000 -0400
+++ linux-2.6.8-rc3.w2/arch/i386/crypto/aes-i586-asm.S	1969-12-31 19:00:00.000000000 -0500
@@ -1,903 +0,0 @@
-// Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
-// All rights reserved.
-//
-// TERMS
-//
-//  Redistribution and use in source and binary forms, with or without
-//  modification, are permitted subject to the following conditions:
-//
-//  1. Redistributions of source code must retain the above copyright
-//     notice, this list of conditions and the following disclaimer.
-//
-//  2. Redistributions in binary form must reproduce the above copyright
-//     notice, this list of conditions and the following disclaimer in the
-//     documentation and/or other materials provided with the distribution.
-//
-//  3. The copyright holder's name must not be used to endorse or promote
-//     any products derived from this software without his specific prior
-//     written permission.
-//
-//  ALTERNATIVELY, provided that this notice is retained in full, this product
-//  may be distributed under the terms of the GNU General Public License (GPL),
-//  in which case the provisions of the GPL apply INSTEAD OF those given above.
-//
-//  This software is provided 'as is' with no express or implied warranties
-//  of correctness or fitness for purpose.
-//
-// This program is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 2 of the License, or (at your option) 
-// any later version.
-
-// Modified by Jari Ruusu,  December 24 2001
-//  - Converted syntax to GNU CPP/assembler syntax
-//  - C programming interface converted back to "old" API
-//  - Minor portability cleanups and speed optimizations
-
-// Modified by Jari Ruusu,  April 11 2002
-//  - Added above copyright and terms to resulting object code so that
-//    binary distributions can avoid legal trouble
-
-// Modified by Clemens Fruhwirth,  Feb 04 2003
-//  - Switched in/out to fit CryptoAPI calls.
-
-// Modified by James Morris,  July 31 2004
-//  - Added alternate GPL licensing clause with permission from Dr Gladman.
-
-// An AES (Rijndael) implementation for the Pentium. This version only
-// implements the standard AES block length (128 bits, 16 bytes). This code
-// does not preserve the eax, ecx or edx registers or the artihmetic status
-// flags. However, the ebx, esi, edi, and ebp registers are preserved across
-// calls.
-
-// void aes_set_key(aes_context *cx, const unsigned char key[], const int key_len, const int f)
-// void aes_encrypt(const aes_context *cx, unsigned char out_blk[], const unsigned char in_blk[])
-// void aes_decrypt(const aes_context *cx, unsigned char out_blk[], const unsigned char in_blk[])
-
-# define ALIGN32BYTES 32
-
-	.file	"aes-i586.S"
-	.globl	aes_set_key
-	.globl	aes_encrypt
-	.globl	aes_decrypt
-
-#define tlen	1024	// length of each of 4 'xor' arrays (256 32-bit words)
-
-// offsets to parameters with one register pushed onto stack
-
-#define ctx	8	// AES context structure
-#define out_blk	12	// output byte array address parameter
-#define in_blk	16	// input byte array address parameter
-
-// offsets in context structure
-
-#define nkey	0	// key length, size 4
-#define nrnd	4	// number of rounds, size 4
-#define ekey	8	// encryption key schedule base address, size 256
-#define dkey	264	// decryption key schedule base address, size 256
-
-// This macro performs a forward encryption cycle. It is entered with
-// the first previous round column values in %eax, %ebx, %esi and %edi and
-// exits with the final values in the same registers.
-
-#define fwd_rnd(p1,p2)			 \
-	mov	%ebx,(%esp)		;\
-	movzbl	%al,%edx		;\
-	mov	%eax,%ecx		;\
-	mov	p2(%ebp),%eax		;\
-	mov	%edi,4(%esp)		;\
-	mov	p2+12(%ebp),%edi	;\
-	xor	p1(,%edx,4),%eax	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	mov	p2+4(%ebp),%ebx		;\
-	xor	p1+tlen(,%edx,4),%edi	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+3*tlen(,%ecx,4),%ebx	;\
-	mov	%esi,%ecx		;\
-	mov	p1+2*tlen(,%edx,4),%esi	;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%esi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%ebx	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%eax	;\
-	mov	(%esp),%edx		;\
-	xor	p1+3*tlen(,%ecx,4),%edi ;\
-	movzbl	%dl,%ecx		;\
-	xor	p2+8(%ebp),%esi		;\
-	xor	p1(,%ecx,4),%ebx	;\
-	movzbl	%dh,%ecx		;\
-	shr	$16,%edx		;\
-	xor	p1+tlen(,%ecx,4),%eax	;\
-	movzbl	%dl,%ecx		;\
-	movzbl	%dh,%edx		;\
-	xor	p1+2*tlen(,%ecx,4),%edi	;\
-	mov	4(%esp),%ecx		;\
-	xor	p1+3*tlen(,%edx,4),%esi ;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%edi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%esi	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%ebx	;\
-	xor	p1+3*tlen(,%ecx,4),%eax
-
-// This macro performs an inverse encryption cycle. It is entered with
-// the first previous round column values in %eax, %ebx, %esi and %edi and
-// exits with the final values in the same registers.
-
-#define inv_rnd(p1,p2)			 \
-	movzbl	%al,%edx		;\
-	mov	%ebx,(%esp)		;\
-	mov	%eax,%ecx		;\
-	mov	p2(%ebp),%eax		;\
-	mov	%edi,4(%esp)		;\
-	mov	p2+4(%ebp),%ebx		;\
-	xor	p1(,%edx,4),%eax	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	mov	p2+12(%ebp),%edi	;\
-	xor	p1+tlen(,%edx,4),%ebx	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+3*tlen(,%ecx,4),%edi	;\
-	mov	%esi,%ecx		;\
-	mov	p1+2*tlen(,%edx,4),%esi	;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%esi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%edi	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%eax	;\
-	mov	(%esp),%edx		;\
-	xor	p1+3*tlen(,%ecx,4),%ebx ;\
-	movzbl	%dl,%ecx		;\
-	xor	p2+8(%ebp),%esi		;\
-	xor	p1(,%ecx,4),%ebx	;\
-	movzbl	%dh,%ecx		;\
-	shr	$16,%edx		;\
-	xor	p1+tlen(,%ecx,4),%esi	;\
-	movzbl	%dl,%ecx		;\
-	movzbl	%dh,%edx		;\
-	xor	p1+2*tlen(,%ecx,4),%edi	;\
-	mov	4(%esp),%ecx		;\
-	xor	p1+3*tlen(,%edx,4),%eax ;\
-	movzbl	%cl,%edx		;\
-	xor	p1(,%edx,4),%edi	;\
-	movzbl	%ch,%edx		;\
-	shr	$16,%ecx		;\
-	xor	p1+tlen(,%edx,4),%eax	;\
-	movzbl	%cl,%edx		;\
-	movzbl	%ch,%ecx		;\
-	xor	p1+2*tlen(,%edx,4),%ebx	;\
-	xor	p1+3*tlen(,%ecx,4),%esi
-
-// AES (Rijndael) Encryption Subroutine
-
-	.text
-	.align	ALIGN32BYTES
-aes_encrypt:
-	push	%ebp
-	mov	ctx(%esp),%ebp		// pointer to context
-	mov	in_blk(%esp),%ecx
-	push	%ebx
-	push	%esi
-	push	%edi
-	mov	nrnd(%ebp),%edx		// number of rounds
-	lea	ekey+16(%ebp),%ebp	// key pointer
-
-// input four columns and xor in first round key
-
-	mov	(%ecx),%eax
-	mov	4(%ecx),%ebx
-	mov	8(%ecx),%esi
-	mov	12(%ecx),%edi
-	xor	-16(%ebp),%eax
-	xor	-12(%ebp),%ebx
-	xor	-8(%ebp),%esi
-	xor	-4(%ebp),%edi
-
-	sub	$8,%esp			// space for register saves on stack
-
-	sub	$10,%edx
-	je	aes_15
-	add	$32,%ebp
-	sub	$2,%edx
-	je	aes_13
-	add	$32,%ebp
-
-	fwd_rnd(aes_ft_tab,-64)		// 14 rounds for 256-bit key
-	fwd_rnd(aes_ft_tab,-48)
-aes_13:	fwd_rnd(aes_ft_tab,-32)		// 12 rounds for 192-bit key
-	fwd_rnd(aes_ft_tab,-16)
-aes_15:	fwd_rnd(aes_ft_tab,0)		// 10 rounds for 128-bit key
-	fwd_rnd(aes_ft_tab,16)
-	fwd_rnd(aes_ft_tab,32)
-	fwd_rnd(aes_ft_tab,48)
-	fwd_rnd(aes_ft_tab,64)
-	fwd_rnd(aes_ft_tab,80)
-	fwd_rnd(aes_ft_tab,96)
-	fwd_rnd(aes_ft_tab,112)
-	fwd_rnd(aes_ft_tab,128)
-	fwd_rnd(aes_fl_tab,144)		// last round uses a different table
-
-// move final values to the output array.
-
-	mov	out_blk+20(%esp),%ebp
-	add	$8,%esp
-	mov	%eax,(%ebp)
-	mov	%ebx,4(%ebp)
-	mov	%esi,8(%ebp)
-	mov	%edi,12(%ebp)
-	pop	%edi
-	pop	%esi
-	pop	%ebx
-	pop	%ebp
-	ret
-
-
-// AES (Rijndael) Decryption Subroutine
-
-	.align	ALIGN32BYTES
-aes_decrypt:
-	push	%ebp
-	mov	ctx(%esp),%ebp		// pointer to context
-	mov	in_blk(%esp),%ecx
-	push	%ebx
-	push	%esi
-	push	%edi
-	mov	nrnd(%ebp),%edx		// number of rounds
-	lea	dkey+16(%ebp),%ebp	// key pointer
-
-// input four columns and xor in first round key
-
-	mov	(%ecx),%eax
-	mov	4(%ecx),%ebx
-	mov	8(%ecx),%esi
-	mov	12(%ecx),%edi
-	xor	-16(%ebp),%eax
-	xor	-12(%ebp),%ebx
-	xor	-8(%ebp),%esi
-	xor	-4(%ebp),%edi
-
-	sub	$8,%esp			// space for register saves on stack
-
-	sub	$10,%edx
-	je	aes_25
-	add	$32,%ebp
-	sub	$2,%edx
-	je	aes_23
-	add	$32,%ebp
-
-	inv_rnd(aes_it_tab,-64)		// 14 rounds for 256-bit key
-	inv_rnd(aes_it_tab,-48)
-aes_23:	inv_rnd(aes_it_tab,-32)		// 12 rounds for 192-bit key
-	inv_rnd(aes_it_tab,-16)
-aes_25:	inv_rnd(aes_it_tab,0)		// 10 rounds for 128-bit key
-	inv_rnd(aes_it_tab,16)
-	inv_rnd(aes_it_tab,32)
-	inv_rnd(aes_it_tab,48)
-	inv_rnd(aes_it_tab,64)
-	inv_rnd(aes_it_tab,80)
-	inv_rnd(aes_it_tab,96)
-	inv_rnd(aes_it_tab,112)
-	inv_rnd(aes_it_tab,128)
-	inv_rnd(aes_il_tab,144)		// last round uses a different table
-
-// move final values to the output array.
-
-	mov	out_blk+20(%esp),%ebp
-	add	$8,%esp
-	mov	%eax,(%ebp)
-	mov	%ebx,4(%ebp)
-	mov	%esi,8(%ebp)
-	mov	%edi,12(%ebp)
-	pop	%edi
-	pop	%esi
-	pop	%ebx
-	pop	%ebp
-	ret
-
-// AES (Rijndael) Key Schedule Subroutine
-
-// input/output parameters
-
-#define aes_cx	12	// AES context
-#define in_key	16	// key input array address
-#define key_ln	20	// key length, bytes (16,24,32) or bits (128,192,256)
-#define ed_flg	24	// 0=create both encr/decr keys, 1=create encr key only
-
-// offsets for locals
-
-#define cnt	-4
-#define kpf	-8
-#define slen	8
-
-// This macro performs a column mixing operation on an input 32-bit
-// word to give a 32-bit result. It uses each of the 4 bytes in the
-// the input column to index 4 different tables of 256 32-bit words
-// that are xored together to form the output value.
-
-#define mix_col(p1)			 \
-	movzbl	%bl,%ecx		;\
-	mov	p1(,%ecx,4),%eax	;\
-	movzbl	%bh,%ecx		;\
-	ror	$16,%ebx		;\
-	xor	p1+tlen(,%ecx,4),%eax	;\
-	movzbl	%bl,%ecx		;\
-	xor	p1+2*tlen(,%ecx,4),%eax	;\
-	movzbl	%bh,%ecx		;\
-	xor	p1+3*tlen(,%ecx,4),%eax
-
-// Key Schedule Macros
-
-#define ksc4(p1)			 \
-	rol	$24,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	ror	$8,%ebx			;\
-	xor	4*p1+aes_rcon_tab,%eax	;\
-	xor	%eax,%esi		;\
-	xor	%esi,%ebp		;\
-	mov	%esi,16*p1(%edi)	;\
-	mov	%ebp,16*p1+4(%edi)	;\
-	xor	%ebp,%edx		;\
-	xor	%edx,%ebx		;\
-	mov	%edx,16*p1+8(%edi)	;\
-	mov	%ebx,16*p1+12(%edi)
-
-#define ksc6(p1)			 \
-	rol	$24,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	ror	$8,%ebx			;\
-	xor	4*p1+aes_rcon_tab,%eax	;\
-	xor	24*p1-24(%edi),%eax	;\
-	mov	%eax,24*p1(%edi)	;\
-	xor	24*p1-20(%edi),%eax	;\
-	mov	%eax,24*p1+4(%edi)	;\
-	xor	%eax,%esi		;\
-	xor	%esi,%ebp		;\
-	mov	%esi,24*p1+8(%edi)	;\
-	mov	%ebp,24*p1+12(%edi)	;\
-	xor	%ebp,%edx		;\
-	xor	%edx,%ebx		;\
-	mov	%edx,24*p1+16(%edi)	;\
-	mov	%ebx,24*p1+20(%edi)
-
-#define ksc8(p1)			 \
-	rol	$24,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	ror	$8,%ebx			;\
-	xor	4*p1+aes_rcon_tab,%eax	;\
-	xor	32*p1-32(%edi),%eax	;\
-	mov	%eax,32*p1(%edi)	;\
-	xor	32*p1-28(%edi),%eax	;\
-	mov	%eax,32*p1+4(%edi)	;\
-	xor	32*p1-24(%edi),%eax	;\
-	mov	%eax,32*p1+8(%edi)	;\
-	xor	32*p1-20(%edi),%eax	;\
-	mov	%eax,32*p1+12(%edi)	;\
-	push	%ebx			;\
-	mov	%eax,%ebx		;\
-	mix_col(aes_fl_tab)		;\
-	pop	%ebx			;\
-	xor	%eax,%esi		;\
-	xor	%esi,%ebp		;\
-	mov	%esi,32*p1+16(%edi)	;\
-	mov	%ebp,32*p1+20(%edi)	;\
-	xor	%ebp,%edx		;\
-	xor	%edx,%ebx		;\
-	mov	%edx,32*p1+24(%edi)	;\
-	mov	%ebx,32*p1+28(%edi)
-
-	.align	ALIGN32BYTES
-aes_set_key:
-	pushfl
-	push	%ebp
-	mov	%esp,%ebp
-	sub	$slen,%esp
-	push	%ebx
-	push	%esi
-	push	%edi
-
-	mov	aes_cx(%ebp),%edx	// edx -> AES context
-
-	mov	key_ln(%ebp),%ecx	// key length
-	cmpl	$128,%ecx
-	jb	aes_30
-	shr	$3,%ecx
-aes_30:	cmpl	$32,%ecx
-	je	aes_32
-	cmpl	$24,%ecx
-	je	aes_32
-	mov	$16,%ecx
-aes_32:	shr	$2,%ecx
-	mov	%ecx,nkey(%edx)
-
-	lea	6(%ecx),%eax		// 10/12/14 for 4/6/8 32-bit key length
-	mov	%eax,nrnd(%edx)
-
-	mov	in_key(%ebp),%esi	// key input array
-	lea	ekey(%edx),%edi		// key position in AES context
-	cld
-	push	%ebp
-	mov	%ecx,%eax		// save key length in eax
-	rep ;	movsl			// words in the key schedule
-	mov	-4(%esi),%ebx		// put some values in registers
-	mov	-8(%esi),%edx		// to allow faster code
-	mov	-12(%esi),%ebp
-	mov	-16(%esi),%esi
-
-	cmpl	$4,%eax			// jump on key size
-	je	aes_36
-	cmpl	$6,%eax
-	je	aes_35
-
-	ksc8(0)
-	ksc8(1)
-	ksc8(2)
-	ksc8(3)
-	ksc8(4)
-	ksc8(5)
-	ksc8(6)
-	jmp	aes_37
-aes_35:	ksc6(0)
-	ksc6(1)
-	ksc6(2)
-	ksc6(3)
-	ksc6(4)
-	ksc6(5)
-	ksc6(6)
-	ksc6(7)
-	jmp	aes_37
-aes_36:	ksc4(0)
-	ksc4(1)
-	ksc4(2)
-	ksc4(3)
-	ksc4(4)
-	ksc4(5)
-	ksc4(6)
-	ksc4(7)
-	ksc4(8)
-	ksc4(9)
-aes_37:	pop	%ebp
-	mov	aes_cx(%ebp),%edx	// edx -> AES context
-	cmpl	$0,ed_flg(%ebp)
-	jne	aes_39
-
-// compile decryption key schedule from encryption schedule - reverse
-// order and do mix_column operation on round keys except first and last
-
-	mov	nrnd(%edx),%eax		// kt = cx->d_key + nc * cx->Nrnd
-	shl	$2,%eax
-	lea	dkey(%edx,%eax,4),%edi
-	lea	ekey(%edx),%esi		// kf = cx->e_key
-
-	movsl				// copy first round key (unmodified)
-	movsl
-	movsl
-	movsl
-	sub	$32,%edi
-	movl	$1,cnt(%ebp)
-aes_38:					// do mix column on each column of
-	lodsl				// each round key
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	lodsl
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	lodsl
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	lodsl
-	mov	%eax,%ebx
-	mix_col(aes_im_tab)
-	stosl
-	sub	$32,%edi
-
-	incl	cnt(%ebp)
-	mov	cnt(%ebp),%eax
-	cmp	nrnd(%edx),%eax
-	jb	aes_38
-
-	movsl				// copy last round key (unmodified)
-	movsl
-	movsl
-	movsl
-aes_39:	pop	%edi
-	pop	%esi
-	pop	%ebx
-	mov	%ebp,%esp
-	pop	%ebp
-	popfl
-	ret
-
-
-// finite field multiplies by {02}, {04} and {08}
-
-#define f2(x)	((x<<1)^(((x>>7)&1)*0x11b))
-#define f4(x)	((x<<2)^(((x>>6)&1)*0x11b)^(((x>>6)&2)*0x11b))
-#define f8(x)	((x<<3)^(((x>>5)&1)*0x11b)^(((x>>5)&2)*0x11b)^(((x>>5)&4)*0x11b))
-
-// finite field multiplies required in table generation
-
-#define f3(x)	(f2(x) ^ x)
-#define f9(x)	(f8(x) ^ x)
-#define fb(x)	(f8(x) ^ f2(x) ^ x)
-#define fd(x)	(f8(x) ^ f4(x) ^ x)
-#define fe(x)	(f8(x) ^ f4(x) ^ f2(x))
-
-// These defines generate the forward table entries
-
-#define u0(x)	((f3(x) << 24) | (x << 16) | (x << 8) | f2(x))
-#define u1(x)	((x << 24) | (x << 16) | (f2(x) << 8) | f3(x))
-#define u2(x)	((x << 24) | (f2(x) << 16) | (f3(x) << 8) | x)
-#define u3(x)	((f2(x) << 24) | (f3(x) << 16) | (x << 8) | x)
-
-// These defines generate the inverse table entries
-
-#define v0(x)	((fb(x) << 24) | (fd(x) << 16) | (f9(x) << 8) | fe(x))
-#define v1(x)	((fd(x) << 24) | (f9(x) << 16) | (fe(x) << 8) | fb(x))
-#define v2(x)	((f9(x) << 24) | (fe(x) << 16) | (fb(x) << 8) | fd(x))
-#define v3(x)	((fe(x) << 24) | (fb(x) << 16) | (fd(x) << 8) | f9(x))
-
-// These defines generate entries for the last round tables
-
-#define w0(x)	(x)
-#define w1(x)	(x <<  8)
-#define w2(x)	(x << 16)
-#define w3(x)	(x << 24)
-
-// macro to generate inverse mix column tables (needed for the key schedule)
-
-#define im_data0(p1) \
-	.long	p1(0x00),p1(0x01),p1(0x02),p1(0x03),p1(0x04),p1(0x05),p1(0x06),p1(0x07) ;\
-	.long	p1(0x08),p1(0x09),p1(0x0a),p1(0x0b),p1(0x0c),p1(0x0d),p1(0x0e),p1(0x0f) ;\
-	.long	p1(0x10),p1(0x11),p1(0x12),p1(0x13),p1(0x14),p1(0x15),p1(0x16),p1(0x17) ;\
-	.long	p1(0x18),p1(0x19),p1(0x1a),p1(0x1b),p1(0x1c),p1(0x1d),p1(0x1e),p1(0x1f)
-#define im_data1(p1) \
-	.long	p1(0x20),p1(0x21),p1(0x22),p1(0x23),p1(0x24),p1(0x25),p1(0x26),p1(0x27) ;\
-	.long	p1(0x28),p1(0x29),p1(0x2a),p1(0x2b),p1(0x2c),p1(0x2d),p1(0x2e),p1(0x2f) ;\
-	.long	p1(0x30),p1(0x31),p1(0x32),p1(0x33),p1(0x34),p1(0x35),p1(0x36),p1(0x37) ;\
-	.long	p1(0x38),p1(0x39),p1(0x3a),p1(0x3b),p1(0x3c),p1(0x3d),p1(0x3e),p1(0x3f)
-#define im_data2(p1) \
-	.long	p1(0x40),p1(0x41),p1(0x42),p1(0x43),p1(0x44),p1(0x45),p1(0x46),p1(0x47) ;\
-	.long	p1(0x48),p1(0x49),p1(0x4a),p1(0x4b),p1(0x4c),p1(0x4d),p1(0x4e),p1(0x4f) ;\
-	.long	p1(0x50),p1(0x51),p1(0x52),p1(0x53),p1(0x54),p1(0x55),p1(0x56),p1(0x57) ;\
-	.long	p1(0x58),p1(0x59),p1(0x5a),p1(0x5b),p1(0x5c),p1(0x5d),p1(0x5e),p1(0x5f)
-#define im_data3(p1) \
-	.long	p1(0x60),p1(0x61),p1(0x62),p1(0x63),p1(0x64),p1(0x65),p1(0x66),p1(0x67) ;\
-	.long	p1(0x68),p1(0x69),p1(0x6a),p1(0x6b),p1(0x6c),p1(0x6d),p1(0x6e),p1(0x6f) ;\
-	.long	p1(0x70),p1(0x71),p1(0x72),p1(0x73),p1(0x74),p1(0x75),p1(0x76),p1(0x77) ;\
-	.long	p1(0x78),p1(0x79),p1(0x7a),p1(0x7b),p1(0x7c),p1(0x7d),p1(0x7e),p1(0x7f)
-#define im_data4(p1) \
-	.long	p1(0x80),p1(0x81),p1(0x82),p1(0x83),p1(0x84),p1(0x85),p1(0x86),p1(0x87) ;\
-	.long	p1(0x88),p1(0x89),p1(0x8a),p1(0x8b),p1(0x8c),p1(0x8d),p1(0x8e),p1(0x8f) ;\
-	.long	p1(0x90),p1(0x91),p1(0x92),p1(0x93),p1(0x94),p1(0x95),p1(0x96),p1(0x97) ;\
-	.long	p1(0x98),p1(0x99),p1(0x9a),p1(0x9b),p1(0x9c),p1(0x9d),p1(0x9e),p1(0x9f)
-#define im_data5(p1) \
-	.long	p1(0xa0),p1(0xa1),p1(0xa2),p1(0xa3),p1(0xa4),p1(0xa5),p1(0xa6),p1(0xa7) ;\
-	.long	p1(0xa8),p1(0xa9),p1(0xaa),p1(0xab),p1(0xac),p1(0xad),p1(0xae),p1(0xaf) ;\
-	.long	p1(0xb0),p1(0xb1),p1(0xb2),p1(0xb3),p1(0xb4),p1(0xb5),p1(0xb6),p1(0xb7) ;\
-	.long	p1(0xb8),p1(0xb9),p1(0xba),p1(0xbb),p1(0xbc),p1(0xbd),p1(0xbe),p1(0xbf)
-#define im_data6(p1) \
-	.long	p1(0xc0),p1(0xc1),p1(0xc2),p1(0xc3),p1(0xc4),p1(0xc5),p1(0xc6),p1(0xc7) ;\
-	.long	p1(0xc8),p1(0xc9),p1(0xca),p1(0xcb),p1(0xcc),p1(0xcd),p1(0xce),p1(0xcf) ;\
-	.long	p1(0xd0),p1(0xd1),p1(0xd2),p1(0xd3),p1(0xd4),p1(0xd5),p1(0xd6),p1(0xd7) ;\
-	.long	p1(0xd8),p1(0xd9),p1(0xda),p1(0xdb),p1(0xdc),p1(0xdd),p1(0xde),p1(0xdf)
-#define im_data7(p1) \
-	.long	p1(0xe0),p1(0xe1),p1(0xe2),p1(0xe3),p1(0xe4),p1(0xe5),p1(0xe6),p1(0xe7) ;\
-	.long	p1(0xe8),p1(0xe9),p1(0xea),p1(0xeb),p1(0xec),p1(0xed),p1(0xee),p1(0xef) ;\
-	.long	p1(0xf0),p1(0xf1),p1(0xf2),p1(0xf3),p1(0xf4),p1(0xf5),p1(0xf6),p1(0xf7) ;\
-	.long	p1(0xf8),p1(0xf9),p1(0xfa),p1(0xfb),p1(0xfc),p1(0xfd),p1(0xfe),p1(0xff)
-
-// S-box data - 256 entries
-
-#define sb_data0(p1) \
-	.long	p1(0x63),p1(0x7c),p1(0x77),p1(0x7b),p1(0xf2),p1(0x6b),p1(0x6f),p1(0xc5) ;\
-	.long	p1(0x30),p1(0x01),p1(0x67),p1(0x2b),p1(0xfe),p1(0xd7),p1(0xab),p1(0x76) ;\
-	.long	p1(0xca),p1(0x82),p1(0xc9),p1(0x7d),p1(0xfa),p1(0x59),p1(0x47),p1(0xf0) ;\
-	.long	p1(0xad),p1(0xd4),p1(0xa2),p1(0xaf),p1(0x9c),p1(0xa4),p1(0x72),p1(0xc0)
-#define sb_data1(p1) \
-	.long	p1(0xb7),p1(0xfd),p1(0x93),p1(0x26),p1(0x36),p1(0x3f),p1(0xf7),p1(0xcc) ;\
-	.long	p1(0x34),p1(0xa5),p1(0xe5),p1(0xf1),p1(0x71),p1(0xd8),p1(0x31),p1(0x15) ;\
-	.long	p1(0x04),p1(0xc7),p1(0x23),p1(0xc3),p1(0x18),p1(0x96),p1(0x05),p1(0x9a) ;\
-	.long	p1(0x07),p1(0x12),p1(0x80),p1(0xe2),p1(0xeb),p1(0x27),p1(0xb2),p1(0x75)
-#define sb_data2(p1) \
-	.long	p1(0x09),p1(0x83),p1(0x2c),p1(0x1a),p1(0x1b),p1(0x6e),p1(0x5a),p1(0xa0) ;\
-	.long	p1(0x52),p1(0x3b),p1(0xd6),p1(0xb3),p1(0x29),p1(0xe3),p1(0x2f),p1(0x84) ;\
-	.long	p1(0x53),p1(0xd1),p1(0x00),p1(0xed),p1(0x20),p1(0xfc),p1(0xb1),p1(0x5b) ;\
-	.long	p1(0x6a),p1(0xcb),p1(0xbe),p1(0x39),p1(0x4a),p1(0x4c),p1(0x58),p1(0xcf)
-#define sb_data3(p1) \
-	.long	p1(0xd0),p1(0xef),p1(0xaa),p1(0xfb),p1(0x43),p1(0x4d),p1(0x33),p1(0x85) ;\
-	.long	p1(0x45),p1(0xf9),p1(0x02),p1(0x7f),p1(0x50),p1(0x3c),p1(0x9f),p1(0xa8) ;\
-	.long	p1(0x51),p1(0xa3),p1(0x40),p1(0x8f),p1(0x92),p1(0x9d),p1(0x38),p1(0xf5) ;\
-	.long	p1(0xbc),p1(0xb6),p1(0xda),p1(0x21),p1(0x10),p1(0xff),p1(0xf3),p1(0xd2)
-#define sb_data4(p1) \
-	.long	p1(0xcd),p1(0x0c),p1(0x13),p1(0xec),p1(0x5f),p1(0x97),p1(0x44),p1(0x17) ;\
-	.long	p1(0xc4),p1(0xa7),p1(0x7e),p1(0x3d),p1(0x64),p1(0x5d),p1(0x19),p1(0x73) ;\
-	.long	p1(0x60),p1(0x81),p1(0x4f),p1(0xdc),p1(0x22),p1(0x2a),p1(0x90),p1(0x88) ;\
-	.long	p1(0x46),p1(0xee),p1(0xb8),p1(0x14),p1(0xde),p1(0x5e),p1(0x0b),p1(0xdb)
-#define sb_data5(p1) \
-	.long	p1(0xe0),p1(0x32),p1(0x3a),p1(0x0a),p1(0x49),p1(0x06),p1(0x24),p1(0x5c) ;\
-	.long	p1(0xc2),p1(0xd3),p1(0xac),p1(0x62),p1(0x91),p1(0x95),p1(0xe4),p1(0x79) ;\
-	.long	p1(0xe7),p1(0xc8),p1(0x37),p1(0x6d),p1(0x8d),p1(0xd5),p1(0x4e),p1(0xa9) ;\
-	.long	p1(0x6c),p1(0x56),p1(0xf4),p1(0xea),p1(0x65),p1(0x7a),p1(0xae),p1(0x08)
-#define sb_data6(p1) \
-	.long	p1(0xba),p1(0x78),p1(0x25),p1(0x2e),p1(0x1c),p1(0xa6),p1(0xb4),p1(0xc6) ;\
-	.long	p1(0xe8),p1(0xdd),p1(0x74),p1(0x1f),p1(0x4b),p1(0xbd),p1(0x8b),p1(0x8a) ;\
-	.long	p1(0x70),p1(0x3e),p1(0xb5),p1(0x66),p1(0x48),p1(0x03),p1(0xf6),p1(0x0e) ;\
-	.long	p1(0x61),p1(0x35),p1(0x57),p1(0xb9),p1(0x86),p1(0xc1),p1(0x1d),p1(0x9e)
-#define sb_data7(p1) \
-	.long	p1(0xe1),p1(0xf8),p1(0x98),p1(0x11),p1(0x69),p1(0xd9),p1(0x8e),p1(0x94) ;\
-	.long	p1(0x9b),p1(0x1e),p1(0x87),p1(0xe9),p1(0xce),p1(0x55),p1(0x28),p1(0xdf) ;\
-	.long	p1(0x8c),p1(0xa1),p1(0x89),p1(0x0d),p1(0xbf),p1(0xe6),p1(0x42),p1(0x68) ;\
-	.long	p1(0x41),p1(0x99),p1(0x2d),p1(0x0f),p1(0xb0),p1(0x54),p1(0xbb),p1(0x16)
-
-// Inverse S-box data - 256 entries
-
-#define ib_data0(p1) \
-	.long	p1(0x52),p1(0x09),p1(0x6a),p1(0xd5),p1(0x30),p1(0x36),p1(0xa5),p1(0x38) ;\
-	.long	p1(0xbf),p1(0x40),p1(0xa3),p1(0x9e),p1(0x81),p1(0xf3),p1(0xd7),p1(0xfb) ;\
-	.long	p1(0x7c),p1(0xe3),p1(0x39),p1(0x82),p1(0x9b),p1(0x2f),p1(0xff),p1(0x87) ;\
-	.long	p1(0x34),p1(0x8e),p1(0x43),p1(0x44),p1(0xc4),p1(0xde),p1(0xe9),p1(0xcb)
-#define ib_data1(p1) \
-	.long	p1(0x54),p1(0x7b),p1(0x94),p1(0x32),p1(0xa6),p1(0xc2),p1(0x23),p1(0x3d) ;\
-	.long	p1(0xee),p1(0x4c),p1(0x95),p1(0x0b),p1(0x42),p1(0xfa),p1(0xc3),p1(0x4e) ;\
-	.long	p1(0x08),p1(0x2e),p1(0xa1),p1(0x66),p1(0x28),p1(0xd9),p1(0x24),p1(0xb2) ;\
-	.long	p1(0x76),p1(0x5b),p1(0xa2),p1(0x49),p1(0x6d),p1(0x8b),p1(0xd1),p1(0x25)
-#define ib_data2(p1) \
-	.long	p1(0x72),p1(0xf8),p1(0xf6),p1(0x64),p1(0x86),p1(0x68),p1(0x98),p1(0x16) ;\
-	.long	p1(0xd4),p1(0xa4),p1(0x5c),p1(0xcc),p1(0x5d),p1(0x65),p1(0xb6),p1(0x92) ;\
-	.long	p1(0x6c),p1(0x70),p1(0x48),p1(0x50),p1(0xfd),p1(0xed),p1(0xb9),p1(0xda) ;\
-	.long	p1(0x5e),p1(0x15),p1(0x46),p1(0x57),p1(0xa7),p1(0x8d),p1(0x9d),p1(0x84)
-#define ib_data3(p1) \
-	.long	p1(0x90),p1(0xd8),p1(0xab),p1(0x00),p1(0x8c),p1(0xbc),p1(0xd3),p1(0x0a) ;\
-	.long	p1(0xf7),p1(0xe4),p1(0x58),p1(0x05),p1(0xb8),p1(0xb3),p1(0x45),p1(0x06) ;\
-	.long	p1(0xd0),p1(0x2c),p1(0x1e),p1(0x8f),p1(0xca),p1(0x3f),p1(0x0f),p1(0x02) ;\
-	.long	p1(0xc1),p1(0xaf),p1(0xbd),p1(0x03),p1(0x01),p1(0x13),p1(0x8a),p1(0x6b)
-#define ib_data4(p1) \
-	.long	p1(0x3a),p1(0x91),p1(0x11),p1(0x41),p1(0x4f),p1(0x67),p1(0xdc),p1(0xea) ;\
-	.long	p1(0x97),p1(0xf2),p1(0xcf),p1(0xce),p1(0xf0),p1(0xb4),p1(0xe6),p1(0x73) ;\
-	.long	p1(0x96),p1(0xac),p1(0x74),p1(0x22),p1(0xe7),p1(0xad),p1(0x35),p1(0x85) ;\
-	.long	p1(0xe2),p1(0xf9),p1(0x37),p1(0xe8),p1(0x1c),p1(0x75),p1(0xdf),p1(0x6e)
-#define ib_data5(p1) \
-	.long	p1(0x47),p1(0xf1),p1(0x1a),p1(0x71),p1(0x1d),p1(0x29),p1(0xc5),p1(0x89) ;\
-	.long	p1(0x6f),p1(0xb7),p1(0x62),p1(0x0e),p1(0xaa),p1(0x18),p1(0xbe),p1(0x1b) ;\
-	.long	p1(0xfc),p1(0x56),p1(0x3e),p1(0x4b),p1(0xc6),p1(0xd2),p1(0x79),p1(0x20) ;\
-	.long	p1(0x9a),p1(0xdb),p1(0xc0),p1(0xfe),p1(0x78),p1(0xcd),p1(0x5a),p1(0xf4)
-#define ib_data6(p1) \
-	.long	p1(0x1f),p1(0xdd),p1(0xa8),p1(0x33),p1(0x88),p1(0x07),p1(0xc7),p1(0x31) ;\
-	.long	p1(0xb1),p1(0x12),p1(0x10),p1(0x59),p1(0x27),p1(0x80),p1(0xec),p1(0x5f) ;\
-	.long	p1(0x60),p1(0x51),p1(0x7f),p1(0xa9),p1(0x19),p1(0xb5),p1(0x4a),p1(0x0d) ;\
-	.long	p1(0x2d),p1(0xe5),p1(0x7a),p1(0x9f),p1(0x93),p1(0xc9),p1(0x9c),p1(0xef)
-#define ib_data7(p1) \
-	.long	p1(0xa0),p1(0xe0),p1(0x3b),p1(0x4d),p1(0xae),p1(0x2a),p1(0xf5),p1(0xb0) ;\
-	.long	p1(0xc8),p1(0xeb),p1(0xbb),p1(0x3c),p1(0x83),p1(0x53),p1(0x99),p1(0x61) ;\
-	.long	p1(0x17),p1(0x2b),p1(0x04),p1(0x7e),p1(0xba),p1(0x77),p1(0xd6),p1(0x26) ;\
-	.long	p1(0xe1),p1(0x69),p1(0x14),p1(0x63),p1(0x55),p1(0x21),p1(0x0c),p1(0x7d)
-
-// The rcon_table (needed for the key schedule)
-//
-// Here is original Dr Brian Gladman's source code:
-//	_rcon_tab:
-//	%assign x   1
-//	%rep 29
-//	    dd  x
-//	%assign x f2(x)
-//	%endrep
-//
-// Here is precomputed output (it's more portable this way):
-
-	.align	ALIGN32BYTES
-aes_rcon_tab:
-	.long	0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80
-	.long	0x1b,0x36,0x6c,0xd8,0xab,0x4d,0x9a,0x2f
-	.long	0x5e,0xbc,0x63,0xc6,0x97,0x35,0x6a,0xd4
-	.long	0xb3,0x7d,0xfa,0xef,0xc5
-
-// The forward xor tables
-
-	.align	ALIGN32BYTES
-aes_ft_tab:
-	sb_data0(u0)
-	sb_data1(u0)
-	sb_data2(u0)
-	sb_data3(u0)
-	sb_data4(u0)
-	sb_data5(u0)
-	sb_data6(u0)
-	sb_data7(u0)
-
-	sb_data0(u1)
-	sb_data1(u1)
-	sb_data2(u1)
-	sb_data3(u1)
-	sb_data4(u1)
-	sb_data5(u1)
-	sb_data6(u1)
-	sb_data7(u1)
-
-	sb_data0(u2)
-	sb_data1(u2)
-	sb_data2(u2)
-	sb_data3(u2)
-	sb_data4(u2)
-	sb_data5(u2)
-	sb_data6(u2)
-	sb_data7(u2)
-
-	sb_data0(u3)
-	sb_data1(u3)
-	sb_data2(u3)
-	sb_data3(u3)
-	sb_data4(u3)
-	sb_data5(u3)
-	sb_data6(u3)
-	sb_data7(u3)
-
-	.align	ALIGN32BYTES
-aes_fl_tab:
-	sb_data0(w0)
-	sb_data1(w0)
-	sb_data2(w0)
-	sb_data3(w0)
-	sb_data4(w0)
-	sb_data5(w0)
-	sb_data6(w0)
-	sb_data7(w0)
-
-	sb_data0(w1)
-	sb_data1(w1)
-	sb_data2(w1)
-	sb_data3(w1)
-	sb_data4(w1)
-	sb_data5(w1)
-	sb_data6(w1)
-	sb_data7(w1)
-
-	sb_data0(w2)
-	sb_data1(w2)
-	sb_data2(w2)
-	sb_data3(w2)
-	sb_data4(w2)
-	sb_data5(w2)
-	sb_data6(w2)
-	sb_data7(w2)
-
-	sb_data0(w3)
-	sb_data1(w3)
-	sb_data2(w3)
-	sb_data3(w3)
-	sb_data4(w3)
-	sb_data5(w3)
-	sb_data6(w3)
-	sb_data7(w3)
-
-// The inverse xor tables
-
-	.align	ALIGN32BYTES
-aes_it_tab:
-	ib_data0(v0)
-	ib_data1(v0)
-	ib_data2(v0)
-	ib_data3(v0)
-	ib_data4(v0)
-	ib_data5(v0)
-	ib_data6(v0)
-	ib_data7(v0)
-
-	ib_data0(v1)
-	ib_data1(v1)
-	ib_data2(v1)
-	ib_data3(v1)
-	ib_data4(v1)
-	ib_data5(v1)
-	ib_data6(v1)
-	ib_data7(v1)
-
-	ib_data0(v2)
-	ib_data1(v2)
-	ib_data2(v2)
-	ib_data3(v2)
-	ib_data4(v2)
-	ib_data5(v2)
-	ib_data6(v2)
-	ib_data7(v2)
-
-	ib_data0(v3)
-	ib_data1(v3)
-	ib_data2(v3)
-	ib_data3(v3)
-	ib_data4(v3)
-	ib_data5(v3)
-	ib_data6(v3)
-	ib_data7(v3)
-
-	.align	ALIGN32BYTES
-aes_il_tab:
-	ib_data0(w0)
-	ib_data1(w0)
-	ib_data2(w0)
-	ib_data3(w0)
-	ib_data4(w0)
-	ib_data5(w0)
-	ib_data6(w0)
-	ib_data7(w0)
-
-	ib_data0(w1)
-	ib_data1(w1)
-	ib_data2(w1)
-	ib_data3(w1)
-	ib_data4(w1)
-	ib_data5(w1)
-	ib_data6(w1)
-	ib_data7(w1)
-
-	ib_data0(w2)
-	ib_data1(w2)
-	ib_data2(w2)
-	ib_data3(w2)
-	ib_data4(w2)
-	ib_data5(w2)
-	ib_data6(w2)
-	ib_data7(w2)
-
-	ib_data0(w3)
-	ib_data1(w3)
-	ib_data2(w3)
-	ib_data3(w3)
-	ib_data4(w3)
-	ib_data5(w3)
-	ib_data6(w3)
-	ib_data7(w3)
-
-// The inverse mix column tables
-
-	.align	ALIGN32BYTES
-aes_im_tab:
-	im_data0(v0)
-	im_data1(v0)
-	im_data2(v0)
-	im_data3(v0)
-	im_data4(v0)
-	im_data5(v0)
-	im_data6(v0)
-	im_data7(v0)
-
-	im_data0(v1)
-	im_data1(v1)
-	im_data2(v1)
-	im_data3(v1)
-	im_data4(v1)
-	im_data5(v1)
-	im_data6(v1)
-	im_data7(v1)
-
-	im_data0(v2)
-	im_data1(v2)
-	im_data2(v2)
-	im_data3(v2)
-	im_data4(v2)
-	im_data5(v2)
-	im_data6(v2)
-	im_data7(v2)
-
-	im_data0(v3)
-	im_data1(v3)
-	im_data2(v3)
-	im_data3(v3)
-	im_data4(v3)
-	im_data5(v3)
-	im_data6(v3)
-	im_data7(v3)
diff -urN -X dontdiff linux-2.6.8-rc3.o/arch/i386/crypto/aes-i586-glue.c linux-2.6.8-rc3.w2/arch/i386/crypto/aes-i586-glue.c
--- linux-2.6.8-rc3.o/arch/i386/crypto/aes-i586-glue.c	2004-08-04 19:43:16.000000000 -0400
+++ linux-2.6.8-rc3.w2/arch/i386/crypto/aes-i586-glue.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,105 +0,0 @@
-/* 
- * 
- * Glue Code for optimized 586 assembler version of AES
- *
- * Copyright (c) 2001, Dr Brian Gladman <brg@gladman.uk.net>, Worcester, UK.
- * Copyright (c) 2003, Adam J. Richter <adam@yggdrasil.com> (conversion to
- * 2.5 API).
- * Copyright (c) 2003, 2004 Fruhwirth Clemens <clemens@endorphin.org>
-*/
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/crypto.h>
-#include <linux/linkage.h>
-
-#define AES_MIN_KEY_SIZE	16
-#define AES_MAX_KEY_SIZE	32
-#define AES_BLOCK_SIZE		16
-#define AES_KS_LENGTH   4 * AES_BLOCK_SIZE
-#define AES_RC_LENGTH   (9 * AES_BLOCK_SIZE) / 8 - 8
-
-typedef struct
-{
-    u_int32_t	 aes_Nkey;	// the number of words in the key input block
-    u_int32_t	 aes_Nrnd;	// the number of cipher rounds
-    u_int32_t	 aes_e_key[AES_KS_LENGTH];   // the encryption key schedule
-    u_int32_t	 aes_d_key[AES_KS_LENGTH];   // the decryption key schedule
-    u_int32_t	 aes_Ncol;	// the number of columns in the cipher state
-} aes_context;
-
-/*
- * The Cipher Interface
- */
- 
-asmlinkage void aes_set_key(void *, const unsigned char [], const int, const int);
-
-
-
-/* Actually:
- * extern void aes_encrypt(const aes_context *, unsigned char [], const unsigned char []);
- * extern void aes_decrypt(const aes_context *, unsigned char [], const unsigned char []);
-*/
- 
-asmlinkage void aes_encrypt(void*, unsigned char [], const unsigned char []);
-asmlinkage void aes_decrypt(void*, unsigned char [], const unsigned char []);
-
-static int aes_set_key_glue(void *cx, const u8 *key,unsigned int key_length, u32 *flags)
-{
-	if(key_length != 16 && key_length != 24 && key_length != 32)
-	{
- 		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-		return -EINVAL;
-	}
-	aes_set_key(cx, key,key_length,0);
-	return 0;
-}
-
-#ifdef CONFIG_REGPARM
-static void aes_encrypt_glue(void* a, unsigned char b[], const unsigned char c[]) {
-	aes_encrypt(a,b,c);
-}
-static void aes_decrypt_glue(void* a, unsigned char b[], const unsigned char c[]) {
-	aes_decrypt(a,b,c);
-}
-#else
-#define aes_encrypt_glue aes_encrypt
-#define aes_decrypt_glue aes_decrypt
-#endif /* CONFIG_REGPARM */
-
-static struct crypto_alg aes_alg = {
-	.cra_name		=	"aes",
-	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-	.cra_blocksize		=	AES_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(aes_context),
-	.cra_module		=	THIS_MODULE,
-	.cra_list		=	LIST_HEAD_INIT(aes_alg.cra_list),
-	.cra_u			=	{
-		.cipher = {
-			.cia_min_keysize	=	AES_MIN_KEY_SIZE,
-			.cia_max_keysize	=	AES_MAX_KEY_SIZE,
-			.cia_setkey	   	= 	aes_set_key_glue,
-			.cia_encrypt	 	=	aes_encrypt_glue,
-			.cia_decrypt	  	=	aes_decrypt_glue
-		}
-	}
-};
-
-static int __init aes_init(void)
-{
-	return crypto_register_alg(&aes_alg);
-}
-
-static void __exit aes_fini(void)
-{
-	crypto_unregister_alg(&aes_alg);
-}
-
-module_init(aes_init);
-module_exit(aes_fini);
-
-MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, i586 asm optimized");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Fruhwirth Clemens");
-MODULE_ALIAS("aes");
diff -urN -X dontdiff linux-2.6.8-rc3.o/arch/i386/crypto/Makefile linux-2.6.8-rc3.w2/arch/i386/crypto/Makefile
--- linux-2.6.8-rc3.o/arch/i386/crypto/Makefile	2004-08-04 19:43:16.000000000 -0400
+++ linux-2.6.8-rc3.w2/arch/i386/crypto/Makefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,9 +0,0 @@
-# 
-# i386/crypto/Makefile 
-# 
-# Arch-specific CryptoAPI modules.
-# 
-
-obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
-
-aes-i586-y := aes-i586-asm.o aes-i586-glue.o
diff -urN -X dontdiff linux-2.6.8-rc3.o/arch/i386/Makefile linux-2.6.8-rc3.w2/arch/i386/Makefile
--- linux-2.6.8-rc3.o/arch/i386/Makefile	2004-08-04 19:43:16.000000000 -0400
+++ linux-2.6.8-rc3.w2/arch/i386/Makefile	2004-08-05 11:28:21.151416376 -0400
@@ -104,8 +104,7 @@
 libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
 					   arch/i386/mm/ \
-					   arch/i386/$(mcore-y)/ \
-					   arch/i386/crypto/
+					   arch/i386/$(mcore-y)/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 # must be linked after kernel/
diff -urN -X dontdiff linux-2.6.8-rc3.o/crypto/Kconfig linux-2.6.8-rc3.w2/crypto/Kconfig
--- linux-2.6.8-rc3.o/crypto/Kconfig	2004-08-04 19:43:17.000000000 -0400
+++ linux-2.6.8-rc3.w2/crypto/Kconfig	2004-08-05 11:28:21.152416224 -0400
@@ -118,9 +118,9 @@
 	  See also:
 	  http://www.cl.cam.ac.uk/~rja14/serpent.html
 
-config CRYPTO_AES_GENERIC
+config CRYPTO_AES
 	tristate "AES cipher algorithms"
-	depends on CRYPTO && !(X86 && !X86_64)
+	depends on CRYPTO
 	help
 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael 
 	  algorithm.
@@ -138,26 +138,6 @@
 
 	  See http://csrc.nist.gov/CryptoToolkit/aes/ for more information.
 
-config CRYPTO_AES_586
-	tristate "AES cipher algorithms (i586)"
-	depends on CRYPTO && (X86 && !X86_64)
-	help
-	  AES cipher algorithms (FIPS-197). AES uses the Rijndael 
-	  algorithm.
-
-	  Rijndael appears to be consistently a very good performer in
-	  both hardware and software across a wide range of computing 
-	  environments regardless of its use in feedback or non-feedback 
-	  modes. Its key setup time is excellent, and its key agility is 
-	  good. Rijndael's very low memory requirements make it very well 
-	  suited for restricted-space environments, in which it also 
-	  demonstrates excellent performance. Rijndael's operations are 
-	  among the easiest to defend against power and timing attacks.	
-
-	  The AES specifies three key sizes: 128, 192 and 256 bits	  
-
-	  See http://csrc.nist.gov/encryption/aes/ for more information.
-
 config CRYPTO_CAST5
 	tristate "CAST5 (CAST-128) cipher algorithm"
 	depends on CRYPTO
diff -urN -X dontdiff linux-2.6.8-rc3.o/Documentation/crypto/api-intro.txt linux-2.6.8-rc3.w2/Documentation/crypto/api-intro.txt
--- linux-2.6.8-rc3.o/Documentation/crypto/api-intro.txt	2004-08-04 19:43:16.000000000 -0400
+++ linux-2.6.8-rc3.w2/Documentation/crypto/api-intro.txt	2004-08-05 11:28:21.166414096 -0400
@@ -215,7 +215,6 @@
   Herbert Valerio Riedel
   Kyle McMartin
   Adam J. Richter
-  Fruhwirth Clemens (i586)
 
 CAST5 algorithm contributors:
   Kartikey Mahendra Bhatt (original developers unknown, FSF copyright).

Re: Linux 2.6.8-rc3 (compile stats)

[John Cherry]

Linux 2.6 Compile Statistics (gcc 3.2.2)
Warnings/Errors Summary

Kernel         bzImage    bzImage  bzImage  modules  bzImage   modules
             (defconfig)  (allno)  (allyes) (allyes) (allmod) (allmod)
-----------  -----------  -------- -------- -------- -------- ---------
2.6.8-rc3      0w/0e       0w/0e    78w/ 0e   4w/0e   1w/0e     72w/0e
2.6.8-rc2      0w/0e       0w/0e    85w/ 0e   5w/0e   1w/0e     79w/0e
2.6.8-rc1      0w/0e       0w/0e    87w/ 0e   5w/0e   1w/0e     82w/0e
2.6.7          0w/0e       0w/0e   108w/ 0e   5w/0e   2w/0e    102w/0e
2.6.7-rc3      0w/0e       0w/0e   108w/ 0e   5w/0e   2w/0e    104w/0e
2.6.7-rc2      0w/0e       0w/0e   110w/ 0e   5w/0e   2w/0e    106w/0e
2.6.7-rc1      0w/0e       0w/0e   111w/ 0e   6w/0e   2w/0e    107w/0e
2.6.6          0w/0e       0w/0e   123w/ 0e   7w/0e   4w/0e    121w/0e
2.6.6-rc3      0w/0e       0w/0e   124w/ 0e   7w/0e   5w/0e    121w/0e
2.6.6-rc2      0w/0e       0w/0e   122w/ 0e   7w/0e   4w/0e    121w/0e
2.6.6-rc1      0w/0e       0w/0e   125w/ 0e   7w/0e   4w/0e    123w/0e
2.6.5          0w/0e       0w/0e   134w/ 0e   8w/0e   4w/0e    132w/0e
2.6.5-rc3      0w/0e       0w/0e   135w/ 0e   8w/0e   4w/0e    132w/0e
2.6.5-rc2      0w/0e       0w/0e   135w/ 0e   8w/0e   3w/0e    132w/0e
2.6.5-rc1      0w/0e       0w/0e   138w/ 0e   8w/0e   3w/0e    135w/0e
2.6.4          1w/0e       0w/0e   145w/ 0e   7w/0e   3w/0e    142w/0e
2.6.4-rc2      1w/0e       0w/0e   148w/ 0e   7w/0e   3w/0e    145w/0e
2.6.4-rc1      1w/0e       0w/0e   148w/ 0e   7w/0e   3w/0e    145w/0e
2.6.3          1w/0e       0w/0e   142w/ 0e   9w/0e   3w/0e    142w/0e
2.6.3-rc4      1w/0e       0w/0e   142w/ 0e   9w/0e   3w/0e    142w/0e
2.6.3-rc3      1w/0e       0w/0e   145w/ 7e   9w/0e   3w/0e    148w/0e
2.6.3-rc2      1w/0e       0w/0e   141w/ 0e   9w/0e   3w/0e    144w/0e
2.6.3-rc1      1w/0e       0w/0e   145w/ 0e   9w/0e   3w/0e    177w/0e
2.6.2          1w/0e       0w/0e   152w/ 0e  12w/0e   3w/0e    187w/0e
2.6.2-rc3      0w/0e       0w/0e   152w/ 0e  12w/0e   3w/0e    187w/0e
2.6.2-rc2      0w/0e       0w/0e   153w/ 8e  12w/0e   3w/0e    188w/0e
2.6.2-rc1      0w/0e       0w/0e   152w/ 0e  12w/0e   3w/0e    187w/0e
2.6.1          0w/0e       0w/0e   158w/ 0e  12w/0e   3w/0e    197w/0e
2.6.1-rc3      0w/0e       0w/0e   158w/ 0e  12w/0e   3w/0e    197w/0e
2.6.1-rc2      0w/0e       0w/0e   166w/ 0e  12w/0e   3w/0e    205w/0e
2.6.1-rc1      0w/0e       0w/0e   167w/ 0e  12w/0e   3w/0e    206w/0e
2.6.0          0w/0e       0w/0e   170w/ 0e  12w/0e   3w/0e    209w/0e

Web page with links to complete details:
   http://developer.osdl.org/cherry/compile/
Daily compiles (ia32): 
   http://developer.osdl.org/cherry/compile/2.6/linus-tree/running.txt
Latest changes in Linus' bitkeeper tree:
   http://linux.bkbits.net:8080/linux-2.5

John

[patch] 2.6.8-rc3: fix modular kernel with gcc 2.95

[Adrian Bunk]

On Tue, Aug 03, 2004 at 03:09:04PM -0700, Linus Torvalds wrote:
>...
> It would be good if people only sent serious stuff for a while, and we can 
> do a real 2.6.8, ok?
>...


I'm still getting a flood of the following errors when using gcc 2.95:


<--  snip  -->

...
if [ -r System.map ]; then /sbin/depmod -ae -F System.map  2.6.8-rc3; fi
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/ymfpci/snd-ymfpci.ko 
needs unknown symbol free_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/ymfpci/snd-ymfpci.ko 
needs unknown symbol request_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/vx222/snd-vx222.ko 
needs unknown symbol free_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/vx222/snd-vx222.ko 
needs unknown symbol request_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/trident/snd-trident.ko 
needs unknown symbol free_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/trident/snd-trident.ko 
needs unknown symbol request_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/snd-via82xx.ko needs 
unknown symbol free_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/snd-via82xx.ko needs 
unknown symbol request_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/snd-sonicvibes.ko needs 
unknown symbol free_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/snd-sonicvibes.ko needs 
unknown symbol request_irq
WARNING: /lib/modules/2.6.8-rc3/kernel/sound/pci/snd-rme96.ko needs 
unknown symbol free_irq
... [several hundred similar lines siped]

<--  snip  -->


The following patch (as 268-rc2-mm1-link-errors.patch already in -mm) 
fixes this issue:



<--  snip  -->


From: Dave Hansen <haveblue@us.ibm.com>

Investigation of why the build is failing due to bogus detection of
undefined symbols: We're getting this warning:

arch/i386/kernel/irq.c
{standard input}: Assembler messages:
{standard input}:3565: Warning: setting incorrect section type for
.bss.page_aligned

Which comes from this code in the 4k stacks code:

static char softirq_stack[NR_CPUS * THREAD_SIZE]  __attribute__((__aligned__(THREAD_SIZE), __section__(".bss.page_aligned")));
static char hardirq_stack[NR_CPUS * THREAD_SIZE]  __attribute__((__aligned__(THREAD_SIZE), __section__(".bss.page_aligned")));

Removing the __section__() fixes it, as does moving to gcc 3.2 or 3.3,
but gcc 2.95 and 3.0 still exhibit the problem.  It seems the 4k stack
developers like newer compilers than I do :) 

The gcc 2.95 section declaration looks like this:
	.section        .bss.page_aligned,"aw",@progbits
while the 3.1 section looks like this:
	.section        .bss.page_aligned,"aw",@nobits

It's definitely a bug that's been fixed:
http://sources.redhat.com/ml/binutils/2002-10/msg00507.html

I've been told that I can fix it with a carefully crafted assembly file and
maybe a change to the linker script, but all that it buys us is a little
space in the uncompressed kernel image.  Plus, the warning will still be
there at compile-time.  

I say, put them back in plain old BSS.  Patch attached.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/i386/kernel/irq.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/irq.c~268-rc2-mm1-link-errors arch/i386/kernel/irq.c
--- 25/arch/i386/kernel/irq.c~268-rc2-mm1-link-errors	2004-07-28 22:11:29.652159016 -0700
+++ 25-akpm/arch/i386/kernel/irq.c	2004-07-28 22:11:29.658158104 -0700
@@ -1118,8 +1118,12 @@ void init_irq_proc (void)
 
 
 #ifdef CONFIG_4KSTACKS
-static char softirq_stack[NR_CPUS * THREAD_SIZE]  __attribute__((__aligned__(THREAD_SIZE), __section__(".bss.page_aligned")));
-static char hardirq_stack[NR_CPUS * THREAD_SIZE]  __attribute__((__aligned__(THREAD_SIZE), __section__(".bss.page_aligned")));
+/*
+ * These should really be __section__(".bss.page_aligned") as well, but
+ * gcc's 3.0 and earlier don't handle that correctly.
+ */
+static char softirq_stack[NR_CPUS * THREAD_SIZE]  __attribute__((__aligned__(THREAD_SIZE)));
+static char hardirq_stack[NR_CPUS * THREAD_SIZE]  __attribute__((__aligned__(THREAD_SIZE)));
 
 /*
  * allocate per-cpu stacks for hardirq and for softirq processing
_

2.6.8-rc3: MPT Fusion compile error with PROC_FS=n

[Adrian Bunk]

The "MPT Fusion driver 3.01.09 update" in 2.6.8-rc causes the following 
compile error with CONFIG_PROC_FS=n:

<--  snip  -->

...
  CC [M]  drivers/message/fusion/mptbase.o
drivers/message/fusion/mptbase.c: In function `mptbase_probe':
drivers/message/fusion/mptbase.c:1394: `procmpt_iocinfo_read' undeclared 
(first use in this function)
drivers/message/fusion/mptbase.c:1394: (Each undeclared identifier is 
reported only once
drivers/message/fusion/mptbase.c:1394: for each function it appears in.)
drivers/message/fusion/mptbase.c:1399: `procmpt_summary_read' undeclared 
(first use in this function)
drivers/message/fusion/mptbase.c: In function `mpt_do_ioc_recovery':
drivers/message/fusion/mptbase.c:1626: warning: `r' might be used 
uninitialized in this function
drivers/message/fusion/mptbase.c: In function `GetIocFacts':
drivers/message/fusion/mptbase.c:2419: warning: unknown conversion type 
character `z' in format
drivers/message/fusion/mptbase.c:2419: warning: too many arguments for 
format
make[3]: *** [drivers/message/fusion/mptbase.o] Error 1

<--  snip  -->

cu
Adrian

-- 

       "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