problems patching XFS against current benh

In file included from /usr/src/kernel_benh/include/linux/modversions.h:166,

                 from /usr/src/kernel_benh/include/linux/module.h:21,
                 from exec_domain.c:14:
/usr/src/kernel_benh/include/linux/modules/ksyms.ver:387:1: warning: "__ver_mark_page_accessed" redefined
In file included from /usr/src/kernel_benh/include/linux/modversions.h:100,
                 from /usr/src/kernel_benh/include/linux/module.h:21,
                 from exec_domain.c:14:

/usr/src/kernel_benh/include/linux/modules/filemap.ver:7:1: warning: this is the location of the previous definition

------

i get this when i've patched current XFS patches (the new ones from today (22-06-2003)) onto benh recent rsync.

in include/linux/sysctl.h, two resources (?) want a VM_ set to 14:

1 =>        VM_HEAP_STACK_GAP=14,   /* int: page gap between heap and stack */
2 =>        VM_PAGEBUF=14,          /* struct: Control pagebuf parameters */
        VM_LAPTOP_MODE=15,
        VM_BLOCK_DUMP=16,

number 1 is from benh, and number 2 is from XFS. i need both - benh's for some drivers for my hardware, and XFS because most of my FSes are XFS.

i get the same error above, even though i set VM_PAGEBUF to say 17 or 18 manually, and there's only one EXPORT_SYMBOL(mark_page_accessed) in ksyms.h. in ksyms.ver and filemap.ver, the version symbols end up being different (as can be seen from the above pasting). i tried twice to change the filemap.ver number to the one that's given in ksyms.ver, and the when the kernel image builds, it fails.

i'm at rope's end right now, i don't know what to do. oh yeh, and i did try on vanilla 2.4.21, and it gives me similar errors about "__ver*" being redefined.

eric

UNIX is user friendly, it's just picky about who its friends are.          
-------------------------------------------------------------------
 ,''`.   http://www.debian.org/  | http://www.nuit.ca/           
 : :' :  Debian GNU/Linux        | http://simonraven.nuit.ca/    
 `. `'                           | PGP key ID: 6169 BE0C 0891 A038    
  `-                             | 

mark_page_accessed is exported in both ksyms.c and filemap.c, both XFS and benh add that export. Remove one of the EXPORT_SYMBOL(mark_page_accessed).

The sysctl numbers have nothing to do with the compile error. Pick another number for one of the conflicting sysctls.