linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* 2.5.68-mm3
@ 2003-04-30  6:59 Andrew Morton
  2003-04-30  7:56 ` 2.5.68-mm3 Andrei Ivanov
                   ` (5 more replies)
  0 siblings, 6 replies; 13+ messages in thread
From: Andrew Morton @ 2003-04-30  6:59 UTC (permalink / raw)
  To: linux-kernel, linux-mm


ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/2.5.68/2.5.68-mm3/

Bits and pieces.  Nothing major, apart from the dynamic request allocation
patch.  This arbitrarily increases the maximum requests/queue to 1024, and
could well make large (and usually bad) changes to various benchmarks. 
However some will be helped.




Changes since 2.5.68-mm2


 linus.patch

 Latest -bk

-irq-printing.patch
-warning-fixes-01.patch
-irqreturn-usb.patch
-devfs-brown-bag.patch
-eisa-sysfs-update.patch
-devfs-pty-fix.patch
-devfs-partition-fix.patch
-kobj_lock-fix.patch
-ppa-null-pointer-fix.patch
-pmd_alloc_one-typo-fix.patch
-sched_idle-typo-fix.patch
-pcmcia-20030421.patch

 Merged

+generic-subarch.patch
+generic-subarch-fix.patch

 Roll up various ia32 SMP configs into one option, work it out at runtime.

+irqreturn-drivers-net.patch

 IRQ API conversion for remaining net drivers.

+irqreturn-bttv.patch

 And bttv

+xd-warning-fix.patch

 Nail a warning

+slab-magazine-layer.patch

 SMP speedup for slab: add a `magazine' layer for passing objects between
 CPUs, rather than passing them all the way back to the page allocator. 
 Mainly for skb's, where the source and sink CPUs are persistently different.

+DAC960-interface-fixes.patch

 Driver fixes

+alt_instr-__KERNEL__.patch

 Add some ifdef wrappers in a header

+modular-jbd.patch

 Fix Kconfig dependencies

+VM_RESERVED-check.patch

 Debug check in page reclaim

+semop-race-fix.patch

 Fix race in sysv shm. (Not complete)

+hdlc-module-update.patch

 Driver update

+proc_file_read-fix.patch

 Fix truncated /proc reads.

+disk_name-size-check.patch

 Clean up some bounds checking in bdevname()

+mwave-cleanup.patch

 Driver cleanup

+blockdev-aio-support.patch

 Better AIO support for IO against /dev/hdXX

+percpu-counters-fix.patch

 UML build fix

-aio-retval-fix.patch

 Ben didn't like it.

+oom-kill-locking.patch

 SMP locking in the oomkiller

+386-access_ok-race-fix.patch

 usercopy-vs-page reclaim fix for 386's

+swapfile-hold-i_sem.patch

 Hold i_sem on swapfiles while they are in use.

+as-remove-debug-checks.patch

 Remove bogusish debug check in anticipatory scheduler.

+dynamic-request-allocation.patch
+dynamic-request-allocation-fix.patch

 Remove the fixed-size request pools, kmalloc them.

-unmap-page-debugging-fixes.patch
-global_flush_tlb-irqs-check.patch
-unmap-page-debugging-fixes-2.patch

 Folded into unmap-page-debugging.patch

-sched-2.5.68-A9.patch
+sched-2.5.68-B2.patch

 CPU scheduler update update.

-generic-bitops-update.patch

 Wrong - is using deprecated cli()/sti().

+pcmcia-deadlock-fix-2.patch

 New PCMCIA fix.

+restore-modinfo-section.patch
+implement-__module_get.patch

 Modules updates from Rusty.




All 113 patches


linus.patch

mm.patch
  add -mmN to EXTRAVERSION

generic-subarch.patch
  generic subarchitecture for ia32

generic-subarch-fix.patch
  generic subarch: SMP only

ipmi-warning-fixes.patch

irqreturn-i2c.patch

irqreturn-uml.patch
  UML updates for the new IRQ API

irqreturn-sound-2.patch
  irqs: sound fixups

irqreturn-smcc.patch
  IRDA: missing IRQ bits

irqreturn-aic79xx.patch
  Fix aic79xx for new IRQ API

SLAB_NO_GROW-fix.patch
  Fix slab-vs-gfp bitflag clash

kgdb-ga.patch
  kgdb stub for ia32 (George Anzinger's one)

kgdb-ga-ppc64-fix.patch

irqreturn-kgdb-ga.patch

irqreturn-drivers-net.patch

irqreturn-bttv.patch
  bttv: new IRQ API

kgdb-ga-smp_num_cpus.patch

kgdb-ga-discontigmem-fixup.patch
  kgdb: discontigmem fixup

apm-locking-fix.patch
  APM locking fix

xd-warning-fix.patch
  Fix warnings in xd.c

slab-magazine-layer.patch
  magazine layer for slab

DAC960-interface-fixes.patch
  DAC960 patch to entry points with a new fix

alt_instr-__KERNEL__.patch
  Place the alt_instr defns inside #ifdef __KERNEL__

config_spinline.patch
  uninline spinlocks for profiling accuracy.

ppc64-reloc_hide.patch

ppc64-pci-patch.patch
  Subject: pci patch

ppc64-aio-32bit-emulation.patch
  32/64bit emulation for aio

ppc64-scruffiness.patch
  Fix some PPC64 compile warnings

ppc64-update.patch
  ppc64 update

ppc64-update-fixes.patch

ppc64-irqfixes.patch

ppc64-pci-bogons.patch

sym-do-160.patch
  make the SYM driver do 160 MB/sec

misc.patch

config-PAGE_OFFSET.patch
  Configurable kenrel/user memory split

fat-speedup.patch
  fat cluster search speedup

buffer-debug.patch
  buffer.c debugging

ext3-truncate-ordered-pages.patch
  ext3: explicitly free truncated pages

modular-jbd.patch
  allow modular JBD

VM_RESERVED-check.patch
  VM_RESERVED check

semop-race-fix.patch
  semtimedop(): Fix racy BUG check

hdlc-module-update.patch
  generic HDLC module API update

proc_file_read-fix.patch
  proc_file_read fix

disk_name-size-check.patch
  use snprintf in disk_name

reiserfs_file_write-5.patch

cleanups.patch
  misc cleanups

mwave-cleanup.patch
  simple mwave code cleanup

rcu-stats.patch
  RCU statistics reporting

ext3-journalled-data-assertion-fix.patch
  Remove incorrect assertion from ext3

nfs-speedup.patch

nfs-oom-fix.patch
  nfs oom fix

sk-allocation.patch
  Subject: Re: nfs oom

nfs-more-oom-fix.patch

rpciod-atomic-allocations.patch
  Make rcpiod use atomic allocations

linux-isp.patch

isp-update-1.patch

ext3-ro-mount-fix.patch
  fs/ext3/super.c fix for orphan recovery error path

nr_threads-docco-fix.patch
  update nr_threads commentary

lost-tick-HZ-fix.patch
  lost_tick fixes

nr_inactive-race-fix.patch
  zone accounting race fix

dcache_lock-vs-tasklist_lock-take-2.patch
  Fix dcache_lock/tasklist_lock ranking bug

clone-retval-fix.patch
  copy_process return value fix

de_thread-fix.patch
  de_thread memory corruption fix

list_del-debug.patch
  list_del debug check

blockdev-aio-support.patch
  aio support for block devices

percpu-counters-fix.patch
  percpu counters cause UML compilation errors in with SMP

airo-schedule-fix.patch
  airo.c: don't sleep in atomic regions

config-menu-aesthetics.patch
  config menu: a combination of aesthetics

oom-kill-locking.patch
  oom-killer locking

386-access_ok-race-fix.patch
  access_ok() race fix for 80386.

synaptics-mouse-support.patch
  Add Synaptics touchpad tweaking to psmouse driver

swapfile-hold-i_sem.patch
  hold i_sem on swapfiles

kblockd.patch
  Create `kblockd' workqueue

cfq-infrastructure.patch

elevator-completion-api.patch
  elevator completion API

as-iosched.patch
  anticipatory I/O scheduler

as-use-completion.patch
  AS use completion notifier

as-remove-debug-checks.patch
  AS: remove debug checks

unplug-use-kblockd.patch
  Use kblockd for running request queues

cfq-2.patch
  CFQ scheduler, #2

dynamic-request-allocation.patch
  rq-dyn-alloc, dynamic request allocation

dynamic-request-allocation-fix.patch
  rq-dyn-alloc fix

unmap-page-debugging.patch
  unmap unused pages for debugging

fremap-all-mappings.patch
  Make all executable mappings be nonlinear

sched-2.5.68-B2.patch
  HT scheduler, sched-2.5.68-B2

sched_idle-typo-fix.patch
  fix sched_idle typo

kgdb-ga-idle-fix.patch

sched-2.5.64-D3.patch
  sched-2.5.64-D3, more interactivity changes

show_task-free-stack-fix.patch
  show_task() fix and cleanup

htree-nfs-fix.patch
  Fix ext3 htree / NFS compatibility problems

i8042-share-irqs.patch
  allow i8042 interrupt sharing

select-speedup.patch
  Subject: Re: IA64 changes to fs/select.c

select-speedup-fix.patch
  select() sleedup fix

slab_store_user-large-objects.patch
  slab debug: perform redzoning against larger objects

htree-nfs-fix-2.patch
  htree nfs fix

htree-leak-fix.patch
  ext3: htree memory leak fix

put_task_struct-debug.patch

ia32-mknod64.patch
  mknod64 for ia32

ext2-64-bit-special-inodes.patch
  ext2: support for 64-bit device nodes

ext3-64-bit-special-inodes.patch
  ext3: support for 64-bit device nodes

64-bit-dev_t-kdev_t.patch
  64-bit dev_t and kdev_t

oops-dump-preceding-code.patch
  i386 oops output: dump preceding code

lockmeter.patch

ext3-no-bkl.patch

journal_dirty_metadata-speedup.patch

journal_get_write_access-speedup.patch

ext3-concurrent-block-inode-allocation.patch
  Subject: [PATCH] concurrent block/inode allocation for EXT3

ext3-orlov-approx-counter-fix.patch
  Fix orlov allocator boundary case

ext3-concurrent-block-allocation-fix-1.patch

ext3-concurrent-block-allocation-hashed.patch
  Subject: Re: [PATCH] concurrent block/inode allocation for EXT3

pcmcia-deadlock-fix-2.patch
  Fix PCMCIA deadlock (rev. 2)

restore-modinfo-section.patch
  modules: restore modinfo section

implement-__module_get.patch
  Implement __module_get




^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  6:59 2.5.68-mm3 Andrew Morton
@ 2003-04-30  7:56 ` Andrei Ivanov
  2003-04-30  8:26   ` 2.5.68-mm3 Andrew Morton
  2003-04-30  9:51 ` 2.5.68-mm3 Felipe Alfaro Solana
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: Andrei Ivanov @ 2003-04-30  7:56 UTC (permalink / raw)
  To: linux-kernel



  gcc -Wp,-MD,net/core/.netfilter.o.d -D__KERNEL__ -Iinclude -Wall 
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common 
-pipe -mpreferred-stack-boundary=2 -march=athlon 
-Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include    
-DKBUILD_BASENAME=netfilter -DKBUILD_MODNAME=netfilter -c -o 
net/core/netfilter.o net/core/netfilter.c
net/core/netfilter.c: In function `nf_reinject':
net/core/netfilter.c:559: `i' undeclared (first use in this function)
net/core/netfilter.c:559: (Each undeclared identifier is reported only 
once
net/core/netfilter.c:559: for each function it appears in.)
net/core/netfilter.c:559: warning: left-hand operand of comma expression 
has no effect
net/core/netfilter.c:559: warning: left-hand operand of comma expression 
has no effect
make[2]: *** [net/core/netfilter.o] Error 1
make[1]: *** [net/core] Error 2
make: *** [net] Error 2


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  7:56 ` 2.5.68-mm3 Andrei Ivanov
@ 2003-04-30  8:26   ` Andrew Morton
  0 siblings, 0 replies; 13+ messages in thread
From: Andrew Morton @ 2003-04-30  8:26 UTC (permalink / raw)
  To: Andrei Ivanov; +Cc: linux-kernel

Andrei Ivanov <andrei.ivanov@ines.ro> wrote:
>
> net/core/netfilter.c: In function `nf_reinject':
> net/core/netfilter.c:559: `i' undeclared (first use in this function)


diff -puN net/core/netfilter.c~netfilter-fix net/core/netfilter.c
--- 25/net/core/netfilter.c~netfilter-fix	2003-04-30 01:23:39.000000000 -0700
+++ 25-akpm/net/core/netfilter.c	2003-04-30 01:23:54.000000000 -0700
@@ -550,6 +550,7 @@ void nf_reinject(struct sk_buff *skb, st
 		 unsigned int verdict)
 {
 	struct list_head *elem = &info->elem->list;
+	struct list_head *i;
 
 	rcu_read_lock();
 

_


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  6:59 2.5.68-mm3 Andrew Morton
  2003-04-30  7:56 ` 2.5.68-mm3 Andrei Ivanov
@ 2003-04-30  9:51 ` Felipe Alfaro Solana
  2003-04-30  9:59   ` 2.5.68-mm3 Andrew Morton
  2003-04-30 18:35   ` 2.5.68-mm3 Greg KH
  2003-04-30 18:04 ` 2.5.68-mm3 jjs
                   ` (3 subsequent siblings)
  5 siblings, 2 replies; 13+ messages in thread
From: Felipe Alfaro Solana @ 2003-04-30  9:51 UTC (permalink / raw)
  To: Andrew Morton; +Cc: LKML, linux-mm

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

On Wed, 2003-04-30 at 08:59, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/2.5.68/2.5.68-mm3/
> 
> Bits and pieces.  Nothing major, apart from the dynamic request allocation
> patch.  This arbitrarily increases the maximum requests/queue to 1024, and
> could well make large (and usually bad) changes to various benchmarks. 
> However some will be helped.

drivers/pcmcia/cs.c: In function `pcmcia_register_socket':
drivers/pcmcia/cs.c:361: `dev' undeclared (first use in this function)
drivers/pcmcia/cs.c:361: (Each undeclared identifier is reported only
once
drivers/pcmcia/cs.c:361: for each function it appears in.)
drivers/pcmcia/cs.c: At top level:
drivers/pcmcia/cs.c:391: conflicting types for
`pcmcia_unregister_socket'
drivers/pcmcia/cs.c:306: previous declaration of
`pcmcia_unregister_socket'
make[4]: *** [drivers/pcmcia/cs.o] Error 1
make[3]: *** [drivers/pcmcia] Error 2
make[2]: *** [drivers] Error 2
make[1]: *** [vmlinux] Error 2

Config file attached :-)

-- 
Please AVOID sending me WORD, EXCEL or POWERPOINT attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
Linux Registered User #287198

[-- Attachment #2: config --]
[-- Type: text/plain, Size: 19540 bytes --]

#
# Automatically generated make config: don't edit
#
CONFIG_X86=y
CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_GENERIC_ISA_DMA=y

#
# Code maturity level options
#
CONFIG_EXPERIMENTAL=y

#
# General setup
#
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
CONFIG_LOG_BUF_SHIFT=14

#
# Loadable module support
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODULE_FORCE_UNLOAD=y
CONFIG_OBSOLETE_MODPARM=y
# CONFIG_MODVERSIONS is not set
CONFIG_KMOD=y

#
# Processor type and features
#
CONFIG_X86_PC=y
# CONFIG_X86_VOYAGER is not set
# CONFIG_X86_NUMAQ is not set
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_VISWS is not set
# CONFIG_X86_GENERICARCH is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M586TSC is not set
# CONFIG_M586MMX is not set
# CONFIG_M686 is not set
# CONFIG_MPENTIUMII is not set
CONFIG_MPENTIUMIII=y
# CONFIG_MPENTIUM4 is not set
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set
# CONFIG_MELAN is not set
# CONFIG_MCRUSOE is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
CONFIG_X86_CMPXCHG=y
CONFIG_X86_XADD=y
CONFIG_X86_L1_CACHE_SHIFT=5
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_INVLPG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_POPAD_OK=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_PREFETCH=y
# CONFIG_HUGETLB_PAGE is not set
# CONFIG_SMP is not set
CONFIG_PREEMPT=y
# CONFIG_X86_UP_APIC is not set
CONFIG_X86_TSC=y
# CONFIG_X86_MCE is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set
# CONFIG_EDD is not set
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_05GB is not set
CONFIG_1GB=y
# CONFIG_2GB is not set
# CONFIG_3GB is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
CONFIG_HAVE_DEC_LOCK=y

#
# Power management options (ACPI, APM)
#
CONFIG_PM=y
# CONFIG_SOFTWARE_SUSPEND is not set

#
# ACPI Support
#
# CONFIG_ACPI is not set
CONFIG_APM=y
# CONFIG_APM_IGNORE_USER_SUSPEND is not set
CONFIG_APM_DO_ENABLE=y
CONFIG_APM_CPU_IDLE=y
CONFIG_APM_DISPLAY_BLANK=y
# CONFIG_APM_RTC_IS_GMT is not set
CONFIG_APM_ALLOW_INTS=y
# CONFIG_APM_REAL_MODE_POWER_OFF is not set

#
# CPU Frequency scaling
#
# CONFIG_CPU_FREQ is not set

#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
#
CONFIG_PCI=y
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
# CONFIG_PCI_LEGACY_PROC is not set
CONFIG_PCI_NAMES=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
CONFIG_HOTPLUG=y

#
# PCMCIA/CardBus support
#
CONFIG_PCMCIA=y
CONFIG_CARDBUS=y
# CONFIG_I82092 is not set
# CONFIG_I82365 is not set
# CONFIG_TCIC is not set

#
# PCI Hotplug Support
#
# CONFIG_HOTPLUG_PCI is not set

#
# Executable file formats
#
CONFIG_KCORE_ELF=y
# CONFIG_KCORE_AOUT is not set
# CONFIG_BINFMT_AOUT is not set
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_MISC=m

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Parallel port support
#
# CONFIG_PARPORT is not set

#
# Plug and Play support
#
# CONFIG_PNP is not set

#
# Block devices
#
CONFIG_BLK_DEV_FD=m
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_DEV_DAC960 is not set
# CONFIG_BLK_DEV_UMEM is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_NBD=m
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_LBD is not set

#
# ATA/ATAPI/MFM/RLL device support
#
CONFIG_IDE=y

#
# IDE, ATA and ATAPI Block devices
#
CONFIG_BLK_DEV_IDE=y

#
# Please see Documentation/ide.txt for help/info on IDE drives
#
# CONFIG_BLK_DEV_HD_IDE is not set
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_IDEDISK=y
CONFIG_IDEDISK_MULTI_MODE=y
# CONFIG_IDEDISK_STROKE is not set
# CONFIG_BLK_DEV_IDECS is not set
CONFIG_BLK_DEV_IDECD=y
# CONFIG_BLK_DEV_IDEFLOPPY is not set
# CONFIG_IDE_TASK_IOCTL is not set

#
# IDE chipset support/bugfixes
#
# CONFIG_BLK_DEV_CMD640 is not set
CONFIG_BLK_DEV_IDEPCI=y
# CONFIG_BLK_DEV_GENERIC is not set
# CONFIG_IDEPCI_SHARE_IRQ is not set
CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_IDE_TCQ is not set
# CONFIG_BLK_DEV_OFFBOARD is not set
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDEDMA_ONLYDISK is not set
CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_PCI_WIP is not set
CONFIG_BLK_DEV_ADMA=y
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_CY82C693 is not set
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=y
# CONFIG_BLK_DEV_NS87415 is not set
# CONFIG_BLK_DEV_OPTI621 is not set
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PDC202XX_NEW is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_SVWKS is not set
# CONFIG_BLK_DEV_SIIMAGE is not set
# CONFIG_BLK_DEV_SIS5513 is not set
# CONFIG_BLK_DEV_SLC90E66 is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_IDEDMA_IVB is not set
CONFIG_BLK_DEV_IDE_MODES=y

#
# SCSI device support
#
# CONFIG_SCSI is not set

#
# Multi-device support (RAID and LVM)
#
# CONFIG_MD is not set

#
# Fusion MPT device support
#

#
# IEEE 1394 (FireWire) support (EXPERIMENTAL)
#
# CONFIG_IEEE1394 is not set

#
# I2O device support
#
# CONFIG_I2O is not set

#
# Networking support
#
CONFIG_NET=y

#
# Networking options
#
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
# CONFIG_NETLINK_DEV is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
# CONFIG_INET_AH is not set
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set

#
# IP: Netfilter Configuration
#
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
# CONFIG_IP_NF_MATCH_LIMIT is not set
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
# CONFIG_IP_NF_MATCH_TOS is not set
# CONFIG_IP_NF_MATCH_ECN is not set
# CONFIG_IP_NF_MATCH_DSCP is not set
# CONFIG_IP_NF_MATCH_AH_ESP is not set
# CONFIG_IP_NF_MATCH_LENGTH is not set
# CONFIG_IP_NF_MATCH_TTL is not set
# CONFIG_IP_NF_MATCH_TCPMSS is not set
CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_CONNTRACK=m
# CONFIG_IP_NF_MATCH_UNCLEAN is not set
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_FILTER=m
# CONFIG_IP_NF_TARGET_REJECT is not set
# CONFIG_IP_NF_TARGET_MIRROR is not set
# CONFIG_IP_NF_NAT is not set
# CONFIG_IP_NF_MANGLE is not set
# CONFIG_IP_NF_TARGET_LOG is not set
# CONFIG_IP_NF_TARGET_ULOG is not set
# CONFIG_IP_NF_TARGET_TCPMSS is not set
# CONFIG_IP_NF_ARPTABLES is not set
# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
# CONFIG_IP_NF_COMPAT_IPFWADM is not set
# CONFIG_IPV6 is not set
# CONFIG_XFRM_USER is not set

#
# SCTP Configuration (EXPERIMENTAL)
#
CONFIG_IPV6_SCTP__=y
# CONFIG_IP_SCTP is not set
# CONFIG_ATM is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_LLC is not set
# CONFIG_DECNET is not set
# CONFIG_BRIDGE is not set
# CONFIG_X25 is not set
# CONFIG_LAPB is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_HW_FLOWCONTROL is not set

#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set

#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
CONFIG_NETDEVICES=y

#
# ARCnet devices
#
# CONFIG_ARCNET is not set
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_EQUALIZER is not set
CONFIG_TUN=m
# CONFIG_ETHERTAP is not set

#
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
# CONFIG_MII is not set
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
# CONFIG_TYPHOON is not set

#
# Tulip family network device support
#
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
# CONFIG_NET_PCI is not set

#
# Ethernet (1000 Mbit)
#
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set

#
# Ethernet (10000 Mbit)
#
# CONFIG_IXGB is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
CONFIG_PPP=m
# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_PPPOE is not set
# CONFIG_SLIP is not set

#
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set

#
# Token Ring devices (depends on LLC=y)
#
# CONFIG_RCPCI is not set
# CONFIG_SHAPER is not set

#
# Wan interfaces
#
# CONFIG_WAN is not set

#
# PCMCIA network device support
#
# CONFIG_NET_PCMCIA is not set

#
# Amateur Radio support
#
# CONFIG_HAMRADIO is not set

#
# IrDA (infrared) support
#
# CONFIG_IRDA is not set

#
# ISDN subsystem
#
# CONFIG_ISDN_BOOL is not set

#
# Telephony Support
#
# CONFIG_PHONE is not set

#
# Input device support
#
CONFIG_INPUT=y

#
# Userland interfaces
#
CONFIG_INPUT_MOUSEDEV=y
CONFIG_INPUT_MOUSEDEV_PSAUX=y
CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_TSDEV is not set
# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set

#
# Input I/O drivers
#
# CONFIG_GAMEPORT is not set
CONFIG_SOUND_GAMEPORT=y
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
# CONFIG_SERIO_SERPORT is not set
# CONFIG_SERIO_CT82C710 is not set

#
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=y
# CONFIG_MOUSE_SERIAL is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set

#
# Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set

#
# Serial drivers
#
# CONFIG_SERIAL_8250 is not set

#
# Non-8250 serial port support
#
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256

#
# I2C support
#
# CONFIG_I2C is not set

#
# I2C Hardware Sensors Mainboard support
#

#
# I2C Hardware Sensors Chip support
#
# CONFIG_I2C_SENSOR is not set

#
# Mice
#
# CONFIG_BUSMOUSE is not set
# CONFIG_QIC02_TAPE is not set

#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set

#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_NVRAM is not set
CONFIG_RTC=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set

#
# Ftape, the floppy tape device driver
#
# CONFIG_FTAPE is not set
CONFIG_AGP=y
CONFIG_AGP_INTEL=y
# CONFIG_AGP_VIA is not set
# CONFIG_AGP_AMD is not set
# CONFIG_AGP_SIS is not set
# CONFIG_AGP_ALI is not set
# CONFIG_AGP_SWORKS is not set
# CONFIG_AGP_AMD_8151 is not set
# CONFIG_DRM is not set

#
# PCMCIA character devices
#
# CONFIG_SYNCLINK_CS is not set
# CONFIG_MWAVE is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HANGCHECK_TIMER is not set

#
# Multimedia devices
#
# CONFIG_VIDEO_DEV is not set

#
# Digital Video Broadcasting Devices
#
# CONFIG_DVB is not set

#
# File systems
#
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
# CONFIG_EXT3_FS is not set
# CONFIG_JBD is not set
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_XFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
CONFIG_AUTOFS4_FS=m

#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_ZISOFS_FS=m
CONFIG_UDF_FS=m

#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
# CONFIG_MSDOS_FS is not set
CONFIG_VFAT_FS=m
# CONFIG_NTFS_FS is not set

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
# CONFIG_DEVFS_FS is not set
CONFIG_DEVPTS_FS=y
CONFIG_TMPFS=y
CONFIG_RAMFS=y

#
# Miscellaneous filesystems
#
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set

#
# Network File Systems
#
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_NFSD_V4=y
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SMB_FS=m
CONFIG_SMB_NLS_DEFAULT=y
CONFIG_SMB_NLS_REMOTE="cp437"
CONFIG_CIFS=m
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
# CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set

#
# Partition Types
#
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y
CONFIG_SMB_NLS=y
CONFIG_NLS=y

#
# Native Language Support
#
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
# CONFIG_NLS_CODEPAGE_737 is not set
# CONFIG_NLS_CODEPAGE_775 is not set
CONFIG_NLS_CODEPAGE_850=m
# CONFIG_NLS_CODEPAGE_852 is not set
# CONFIG_NLS_CODEPAGE_855 is not set
# CONFIG_NLS_CODEPAGE_857 is not set
# CONFIG_NLS_CODEPAGE_860 is not set
# CONFIG_NLS_CODEPAGE_861 is not set
# CONFIG_NLS_CODEPAGE_862 is not set
# CONFIG_NLS_CODEPAGE_863 is not set
# CONFIG_NLS_CODEPAGE_864 is not set
# CONFIG_NLS_CODEPAGE_865 is not set
# CONFIG_NLS_CODEPAGE_866 is not set
# CONFIG_NLS_CODEPAGE_869 is not set
# CONFIG_NLS_CODEPAGE_936 is not set
# CONFIG_NLS_CODEPAGE_950 is not set
# CONFIG_NLS_CODEPAGE_932 is not set
# CONFIG_NLS_CODEPAGE_949 is not set
# CONFIG_NLS_CODEPAGE_874 is not set
# CONFIG_NLS_ISO8859_8 is not set
# CONFIG_NLS_CODEPAGE_1250 is not set
# CONFIG_NLS_CODEPAGE_1251 is not set
CONFIG_NLS_ISO8859_1=m
# CONFIG_NLS_ISO8859_2 is not set
# CONFIG_NLS_ISO8859_3 is not set
# CONFIG_NLS_ISO8859_4 is not set
# CONFIG_NLS_ISO8859_5 is not set
# CONFIG_NLS_ISO8859_6 is not set
# CONFIG_NLS_ISO8859_7 is not set
# CONFIG_NLS_ISO8859_9 is not set
# CONFIG_NLS_ISO8859_13 is not set
# CONFIG_NLS_ISO8859_14 is not set
CONFIG_NLS_ISO8859_15=m
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
CONFIG_NLS_UTF8=m

#
# Graphics support
#
# CONFIG_FB is not set
CONFIG_VIDEO_SELECT=y

#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y

#
# Sound
#
CONFIG_SOUND=y

#
# Advanced Linux Sound Architecture
#
CONFIG_SND=y
# CONFIG_SND_SEQUENCER is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_RTCTIMER=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set

#
# Generic devices
#
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set

#
# PCI devices
#
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS4281 is not set
# CONFIG_SND_EMU10K1 is not set
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_NM256 is not set
# CONFIG_SND_RME32 is not set
# CONFIG_SND_RME96 is not set
# CONFIG_SND_RME9652 is not set
# CONFIG_SND_HDSP is not set
# CONFIG_SND_TRIDENT is not set
CONFIG_SND_YMFPCI=y
# CONFIG_SND_ALS4000 is not set
# CONFIG_SND_CMIPCI is not set
# CONFIG_SND_ENS1370 is not set
# CONFIG_SND_ENS1371 is not set
# CONFIG_SND_ES1938 is not set
# CONFIG_SND_ES1968 is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_FM801 is not set
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_VIA82XX is not set

#
# ALSA USB devices
#
# CONFIG_SND_USB_AUDIO is not set

#
# Open Sound System
#
# CONFIG_SOUND_PRIME is not set

#
# USB support
#
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set

#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y
# CONFIG_USB_BANDWIDTH is not set
# CONFIG_USB_DYNAMIC_MINORS is not set

#
# USB Host Controller Drivers
#
# CONFIG_USB_EHCI_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
CONFIG_USB_UHCI_HCD=y

#
# USB Device Class drivers
#
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_MIDI is not set
# CONFIG_USB_ACM is not set
CONFIG_USB_PRINTER=m

#
# SCSI support is needed for USB Storage
#

#
# USB Human Interface Devices (HID)
#
CONFIG_USB_HID=y
CONFIG_USB_HIDINPUT=y
# CONFIG_HID_FF is not set
CONFIG_USB_HIDDEV=y
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# CONFIG_USB_KBTAB is not set
# CONFIG_USB_POWERMATE is not set
# CONFIG_USB_XPAD is not set

#
# USB Imaging devices
#
# CONFIG_USB_MDC800 is not set
CONFIG_USB_SCANNER=m

#
# USB Multimedia devices
#
# CONFIG_USB_DABUSB is not set

#
# Video4Linux support is needed for USB Multimedia device support
#

#
# USB Network adaptors
#
# CONFIG_USB_CATC is not set
# CONFIG_USB_CDCETHER is not set
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
# CONFIG_USB_USBNET is not set

#
# USB port drivers
#

#
# USB Serial Converter support
#
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
# CONFIG_USB_SERIAL_BELKIN is not set
# CONFIG_USB_SERIAL_WHITEHEAT is not set
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
# CONFIG_USB_SERIAL_EMPEG is not set
# CONFIG_USB_SERIAL_FTDI_SIO is not set
# CONFIG_USB_SERIAL_VISOR is not set
CONFIG_USB_SERIAL_IPAQ=m
# CONFIG_USB_SERIAL_IR is not set
# CONFIG_USB_SERIAL_EDGEPORT is not set
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
# CONFIG_USB_SERIAL_KEYSPAN is not set
# CONFIG_USB_SERIAL_KLSI is not set
# CONFIG_USB_SERIAL_KOBIL_SCT is not set
# CONFIG_USB_SERIAL_MCT_U232 is not set
# CONFIG_USB_SERIAL_PL2303 is not set
# CONFIG_USB_SERIAL_SAFE is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
# CONFIG_USB_SERIAL_OMNINET is not set

#
# USB Miscellaneous drivers
#
# CONFIG_USB_TIGL is not set
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_BRLVGER is not set
# CONFIG_USB_LCD is not set
# CONFIG_USB_TEST is not set

#
# Bluetooth support
#
# CONFIG_BT is not set

#
# Profiling support
#
# CONFIG_PROFILING is not set

#
# Kernel hacking
#
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_KALLSYMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
CONFIG_DEBUG_INFO=y
# CONFIG_FRAME_POINTER is not set

#
# Security options
#
# CONFIG_SECURITY is not set

#
# Cryptographic options
#
CONFIG_CRYPTO=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_AES=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_TEST=m

#
# Library routines
#
# CONFIG_CRC32 is not set
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
CONFIG_X86_BIOS_REBOOT=y

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  9:51 ` 2.5.68-mm3 Felipe Alfaro Solana
@ 2003-04-30  9:59   ` Andrew Morton
  2003-04-30 18:35   ` 2.5.68-mm3 Greg KH
  1 sibling, 0 replies; 13+ messages in thread
From: Andrew Morton @ 2003-04-30  9:59 UTC (permalink / raw)
  To: Felipe Alfaro Solana; +Cc: linux-kernel, linux-mm, Russell King

Felipe Alfaro Solana <felipe_alfaro@linuxmail.org> wrote:
>
> drivers/pcmcia/cs.c: In function `pcmcia_register_socket':
> drivers/pcmcia/cs.c:361: `dev' undeclared (first use in this function)
> drivers/pcmcia/cs.c:361: (Each undeclared identifier is reported only
> once
> drivers/pcmcia/cs.c:361: for each function it appears in.)
> drivers/pcmcia/cs.c: At top level:
> drivers/pcmcia/cs.c:391: conflicting types for
> `pcmcia_unregister_socket'



diff -puN drivers/pcmcia/cs.c~pcmcia-fix drivers/pcmcia/cs.c
--- 25/drivers/pcmcia/cs.c~pcmcia-fix	2003-04-30 02:55:46.000000000 -0700
+++ 25-akpm/drivers/pcmcia/cs.c	2003-04-30 02:58:54.000000000 -0700
@@ -303,7 +303,7 @@ static int proc_read_clients(char *buf, 
 ======================================================================*/
 
 static int pccardd(void *__skt);
-void pcmcia_unregister_socket(struct device *dev);
+static void pcmcia_unregister_socket(struct class_device *class_dev);
 
 #define to_class_data(dev) dev->class_data
 
@@ -358,7 +358,7 @@ int pcmcia_register_socket(struct class_
 		spin_lock_init(&s->thread_lock);
 		ret = kernel_thread(pccardd, s, CLONE_KERNEL);
 		if (ret < 0) {
-			pcmcia_unregister_socket(dev);
+			pcmcia_unregister_socket(class_dev);
 			break;
 		}
 
@@ -387,7 +387,7 @@ int pcmcia_register_socket(struct class_
 /**
  * pcmcia_unregister_socket - remove a pcmcia socket device
  */
-void pcmcia_unregister_socket(struct class_device *class_dev)
+static void pcmcia_unregister_socket(struct class_device *class_dev)
 {
 	struct pcmcia_socket_class_data *cls_d = class_get_devdata(class_dev);
 	unsigned int i;

_
_


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  6:59 2.5.68-mm3 Andrew Morton
  2003-04-30  7:56 ` 2.5.68-mm3 Andrei Ivanov
  2003-04-30  9:51 ` 2.5.68-mm3 Felipe Alfaro Solana
@ 2003-04-30 18:04 ` jjs
  2003-04-30 19:28 ` 2.5.68-mm3 Danny ter Haar
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 13+ messages in thread
From: jjs @ 2003-04-30 18:04 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux kernel

Hurrah - rwhod is working again -

Aside from the needed nf_reinject patch
this all looks quite nice, will put it through
it's paces later -

Joe


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  9:51 ` 2.5.68-mm3 Felipe Alfaro Solana
  2003-04-30  9:59   ` 2.5.68-mm3 Andrew Morton
@ 2003-04-30 18:35   ` Greg KH
  2003-04-30 22:58     ` 2.5.68-mm3 Felipe Alfaro Solana
  1 sibling, 1 reply; 13+ messages in thread
From: Greg KH @ 2003-04-30 18:35 UTC (permalink / raw)
  To: Felipe Alfaro Solana; +Cc: Andrew Morton, LKML, linux-mm

On Wed, Apr 30, 2003 at 11:51:13AM +0200, Felipe Alfaro Solana wrote:
> 
> drivers/pcmcia/cs.c: In function `pcmcia_register_socket':
> drivers/pcmcia/cs.c:361: `dev' undeclared (first use in this function)
> drivers/pcmcia/cs.c:361: (Each undeclared identifier is reported only
> once
> drivers/pcmcia/cs.c:361: for each function it appears in.)
> drivers/pcmcia/cs.c: At top level:
> drivers/pcmcia/cs.c:391: conflicting types for
> `pcmcia_unregister_socket'
> drivers/pcmcia/cs.c:306: previous declaration of
> `pcmcia_unregister_socket'
> make[4]: *** [drivers/pcmcia/cs.o] Error 1
> make[3]: *** [drivers/pcmcia] Error 2
> make[2]: *** [drivers] Error 2
> make[1]: *** [vmlinux] Error 2
> 
> Config file attached :-)

Does this also happen on the latest -bk tree?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  6:59 2.5.68-mm3 Andrew Morton
                   ` (2 preceding siblings ...)
  2003-04-30 18:04 ` 2.5.68-mm3 jjs
@ 2003-04-30 19:28 ` Danny ter Haar
  2003-04-30 23:57 ` 2.5.68-mm3 Ed Tomlinson
  2003-05-01  3:18 ` 2.5.68-mm3 steven roemen
  5 siblings, 0 replies; 13+ messages in thread
From: Danny ter Haar @ 2003-04-30 19:28 UTC (permalink / raw)
  To: linux-kernel

Andrew Morton  <akpm@digeo.com> wrote:
>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/2.5.68/2.5.68-mm3/

On my laptop it doesn't compile with bluetooth enabled:

/usr/bin/make -f scripts/Makefile.build obj=drivers/bluetooth
  gcc -Wp,-MD,drivers/bluetooth/.hci_usb.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=pentium3 -Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc -iwithprefix include -DMODULE   -DKBUILD_BASENAME=hci_usb -DKBUILD_MODNAME=hci_usb -c -o drivers/bluetooth/.tmp_hci_usb.o drivers/bluetooth/hci_usb.c
drivers/bluetooth/hci_usb.c: In function `hci_usb_send_bulk':
drivers/bluetooth/hci_usb.c:461: `USB_ZERO_PACKET' undeclared (first use in this function)
drivers/bluetooth/hci_usb.c:461: (Each undeclared identifier is reported only once
drivers/bluetooth/hci_usb.c:461: for each function it appears in.)
make[3]: *** [drivers/bluetooth/hci_usb.o] Error 1
make[2]: *** [drivers/bluetooth] Error 2
make[1]: *** [drivers] Error 2
make[1]: Leaving directory `/extra/usr.src/linux-2.5.68-mm3'

I found another thread regarding hci_usb and am not sure
if this is related/same.

Danny
-- 
Miguel   | "I can't tell if I have worked all my life or if
de Icaza |  I have never worked a single day of my life,"


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30 18:35   ` 2.5.68-mm3 Greg KH
@ 2003-04-30 22:58     ` Felipe Alfaro Solana
  0 siblings, 0 replies; 13+ messages in thread
From: Felipe Alfaro Solana @ 2003-04-30 22:58 UTC (permalink / raw)
  To: Greg KH; +Cc: Andrew Morton, LKML, linux-mm

On Wed, 2003-04-30 at 20:35, Greg KH wrote:
> On Wed, Apr 30, 2003 at 11:51:13AM +0200, Felipe Alfaro Solana wrote:
> > 
> > drivers/pcmcia/cs.c: In function `pcmcia_register_socket':
> > drivers/pcmcia/cs.c:361: `dev' undeclared (first use in this function)
> > drivers/pcmcia/cs.c:361: (Each undeclared identifier is reported only
> > once
> > drivers/pcmcia/cs.c:361: for each function it appears in.)
> > drivers/pcmcia/cs.c: At top level:
> > drivers/pcmcia/cs.c:391: conflicting types for
> > `pcmcia_unregister_socket'
> > drivers/pcmcia/cs.c:306: previous declaration of
> > `pcmcia_unregister_socket'
> > make[4]: *** [drivers/pcmcia/cs.o] Error 1
> > make[3]: *** [drivers/pcmcia] Error 2
> > make[2]: *** [drivers] Error 2
> > make[1]: *** [vmlinux] Error 2
> > 
> > Config file attached :-)
> 
> Does this also happen on the latest -bk tree?

Seems to be fixed in 2.5.68-bk10...
-- 
Please AVOID sending me WORD, EXCEL or POWERPOINT attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
Linux Registered User #287198


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  6:59 2.5.68-mm3 Andrew Morton
                   ` (3 preceding siblings ...)
  2003-04-30 19:28 ` 2.5.68-mm3 Danny ter Haar
@ 2003-04-30 23:57 ` Ed Tomlinson
  2003-05-01  0:04   ` 2.5.68-mm3 Andrew Morton
  2003-05-01  3:18 ` 2.5.68-mm3 steven roemen
  5 siblings, 1 reply; 13+ messages in thread
From: Ed Tomlinson @ 2003-04-30 23:57 UTC (permalink / raw)
  To: Andrew Morton, linux-kernel, linux-mm

On April 30, 2003 02:59 am, Andrew Morton wrote:
> Bits and pieces.  Nothing major, apart from the dynamic request allocation
> patch.  This arbitrarily increases the maximum requests/queue to 1024, and
> could well make large (and usually bad) changes to various benchmarks.
> However some will be helped.

Here is something a little broken.  Suspect it might be in 68-bk too:

if [ -r System.map ]; then /sbin/depmod -ae -F System.map  2.5.68-mm3; fi
WARNING: /lib/modules/2.5.68-mm3/kernel/sound/oss/cs46xx.ko needs unknown symbol cs4x_ClearPageReserved

Ed Tomlinson

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30 23:57 ` 2.5.68-mm3 Ed Tomlinson
@ 2003-05-01  0:04   ` Andrew Morton
  0 siblings, 0 replies; 13+ messages in thread
From: Andrew Morton @ 2003-05-01  0:04 UTC (permalink / raw)
  To: Ed Tomlinson; +Cc: linux-kernel, linux-mm

Ed Tomlinson <tomlins@cam.org> wrote:
>
> On April 30, 2003 02:59 am, Andrew Morton wrote:
> > Bits and pieces.  Nothing major, apart from the dynamic request allocation
> > patch.  This arbitrarily increases the maximum requests/queue to 1024, and
> > could well make large (and usually bad) changes to various benchmarks.
> > However some will be helped.
> 
> Here is something a little broken.  Suspect it might be in 68-bk too:
> 
> if [ -r System.map ]; then /sbin/depmod -ae -F System.map  2.5.68-mm3; fi
> WARNING: /lib/modules/2.5.68-mm3/kernel/sound/oss/cs46xx.ko needs unknown symbol cs4x_ClearPageReserved
> 

Yes, thanks.  It's a case of search-n-replace-n-dont-test.


diff -puN sound/oss/cs46xx.c~cs46xx-PageReserved-fix sound/oss/cs46xx.c
--- 25/sound/oss/cs46xx.c~cs46xx-PageReserved-fix	Wed Apr 30 17:03:41 2003
+++ 25-akpm/sound/oss/cs46xx.c	Wed Apr 30 17:03:48 2003
@@ -1247,7 +1247,7 @@ static void dealloc_dmabuf(struct cs_sta
 		mapend = virt_to_page(dmabuf->rawbuf + 
 				(PAGE_SIZE << dmabuf->buforder) - 1);
 		for (map = virt_to_page(dmabuf->rawbuf); map <= mapend; map++)
-			cs4x_ClearPageReserved(map);
+			ClearPageReserved(map);
 		free_dmabuf(state->card, dmabuf);
 	}
 
@@ -1256,7 +1256,7 @@ static void dealloc_dmabuf(struct cs_sta
 		mapend = virt_to_page(dmabuf->tmpbuff +
 				(PAGE_SIZE << dmabuf->buforder_tmpbuff) - 1);
 		for (map = virt_to_page(dmabuf->tmpbuff); map <= mapend; map++)
-			cs4x_ClearPageReserved(map);
+			ClearPageReserved(map);
 		free_dmabuf2(state->card, dmabuf);
 	}
 

_


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-04-30  6:59 2.5.68-mm3 Andrew Morton
                   ` (4 preceding siblings ...)
  2003-04-30 23:57 ` 2.5.68-mm3 Ed Tomlinson
@ 2003-05-01  3:18 ` steven roemen
  2003-05-01 17:47   ` 2.5.68-mm3 Greg KH
  5 siblings, 1 reply; 13+ messages in thread
From: steven roemen @ 2003-05-01  3:18 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-kernel, linux-mm

i think this has been reported for linus's tree, but i noticed it with
-mm3

Steve

make -f scripts/Makefile.build obj=drivers/ieee1394
  gcc -Wp,-MD,drivers/ieee1394/.nodemgr.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-pipe -mpreferred-stack-boundary=2 -march=athlon
-Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc
-iwithprefix include    -DKBUILD_BASENAME=nodemgr
-DKBUILD_MODNAME=ieee1394 -c -o drivers/ieee1394/.tmp_nodemgr.o
drivers/ieee1394/nodemgr.c
drivers/ieee1394/nodemgr.c: In function `nodemgr_bus_match':
drivers/ieee1394/nodemgr.c:367: structure has no member named
`class_num'
drivers/ieee1394/nodemgr.c: At top level:
drivers/ieee1394/nodemgr.c:497: unknown field `class_num' specified in
initializer
drivers/ieee1394/nodemgr.c:497: warning: excess elements in struct
initializer
drivers/ieee1394/nodemgr.c:497: warning: (near initialization for
`nodemgr_dev_template_ud')
drivers/ieee1394/nodemgr.c:503: unknown field `class_num' specified in
initializer
drivers/ieee1394/nodemgr.c:503: warning: excess elements in struct
initializer
drivers/ieee1394/nodemgr.c:503: warning: (near initialization for
`nodemgr_dev_template_ne')
drivers/ieee1394/nodemgr.c:508: unknown field `class_num' specified in
initializer
drivers/ieee1394/nodemgr.c:508: warning: initialization makes pointer
from integer without a cast
drivers/ieee1394/nodemgr.c: In function `nodemgr_guid_search_cb':
drivers/ieee1394/nodemgr.c:730: structure has no member named
`class_num'
drivers/ieee1394/nodemgr.c: In function `nodemgr_nodeid_search_cb':
drivers/ieee1394/nodemgr.c:767: structure has no member named
`class_num'
drivers/ieee1394/nodemgr.c: In function `nodemgr_driver_search_cb':
drivers/ieee1394/nodemgr.c:1261: structure has no member named
`class_num'
drivers/ieee1394/nodemgr.c: In function `nodemgr_remove_node':
drivers/ieee1394/nodemgr.c:1449: structure has no member named
`class_num'
make[2]: *** [drivers/ieee1394/nodemgr.o] Error 1
make[1]: *** [drivers/ieee1394] Error 2
make: *** [drivers] Error 2



^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: 2.5.68-mm3
  2003-05-01  3:18 ` 2.5.68-mm3 steven roemen
@ 2003-05-01 17:47   ` Greg KH
  0 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2003-05-01 17:47 UTC (permalink / raw)
  To: steven roemen; +Cc: Andrew Morton, linux-kernel, linux-mm

On Wed, Apr 30, 2003 at 10:18:35PM -0500, steven roemen wrote:
> i think this has been reported for linus's tree, but i noticed it with
> -mm3

Yes it has, and it's now fixed in Linus's tree.

greg k-h

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2003-05-01 17:33 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-04-30  6:59 2.5.68-mm3 Andrew Morton
2003-04-30  7:56 ` 2.5.68-mm3 Andrei Ivanov
2003-04-30  8:26   ` 2.5.68-mm3 Andrew Morton
2003-04-30  9:51 ` 2.5.68-mm3 Felipe Alfaro Solana
2003-04-30  9:59   ` 2.5.68-mm3 Andrew Morton
2003-04-30 18:35   ` 2.5.68-mm3 Greg KH
2003-04-30 22:58     ` 2.5.68-mm3 Felipe Alfaro Solana
2003-04-30 18:04 ` 2.5.68-mm3 jjs
2003-04-30 19:28 ` 2.5.68-mm3 Danny ter Haar
2003-04-30 23:57 ` 2.5.68-mm3 Ed Tomlinson
2003-05-01  0:04   ` 2.5.68-mm3 Andrew Morton
2003-05-01  3:18 ` 2.5.68-mm3 steven roemen
2003-05-01 17:47   ` 2.5.68-mm3 Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).