FIx compile of swim3 as module
Subsystems (2)
PATCH 1/1 FIx compile of swim3 as module
The current pmac32_defconfig fails to build with the following error:
Building modules, stage 2.
ERROR: "check_media_bay" [drivers/block/swim3.ko] undefined!
WARNING: modpost: Found 23 section mismatch(es). To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
make[2]: *** [__modpost] Error 1
This patch fixes that.
---
drivers/block/swim3.c | 4 ---- drivers/macintosh/mediabay.c | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-)
drivers/block/swim3.c +0 -4
@@ -251,10 +251,6 @@ static int floppy_release(struct inode *inode, struct file *filp);static int floppy_check_change (struct gendisk *disk);static int floppy_revalidate (struct gendisk *disk); -#ifndef CONFIG_PMAC_MEDIABAY -#define check_media_bay (which, what) 1 -#endif -static void swim3_select (struct floppy_state *fs,int sel) {struct swim3 __iomem *sw = fs->swim3;
drivers/macintosh/mediabay.c +0 -2
@@ -416,7 +416,6 @@ static void poll_media_bay(struct media_bay_info* bay) } } -#ifdef CONFIG_MAC_FLOPPY int check_media_bay (struct device_node *which_bay,int what) {int i;
@@ -431,7 +430,6 @@ int check_media_bay(struct device_node *which_bay, int what)return -ENODEV ; }EXPORT_SYMBOL (check_media_bay); -#endif /* CONFIG_MAC_FLOPPY */ #ifdef CONFIG_BLK_DEV_IDE_PMAC int check_media_bay_by_base (unsigned long base,int what)
Yours Tony
linux.conf.au http://linux.conf.au/ || http://lca2008.linux.org.au/
Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!
Quoted 10 lines · On Wed, 13 Feb 2008 13:40:20 +1100 [email protected] (Tony Breeds) wrote:
The current
pmac32_defconfigfails to build with the following error:Building modules, stage 2.
ERROR: "check_media_bay" [drivers/block/swim3.ko] undefined!
WARNING: modpost: Found 23 section mismatch(es). To see full details build your kernel with:
'makeCONFIG_DEBUG_SECTION_MISMATCH=y'
make[2]: *** [__modpost] Error 1This patch fixes that.
Kyle posted a slightly different patch that seemed to still keep the original intention of ifdefery in tact. I've no idea which is better, but the three of you might want to compare notes.
josh
Quoted 3 lines · Josh Boyer
Kyle posted a slightly different patch that seemed to still keep the original intention of ifdefery in tact. I've no idea which is better, but the three of you might want to compare notes.
/me checks ....
Hmm Kyle's seem the leave the:
#ifndef CONFIG_PMAC_MEDIABAY
#define check_media_bay(which, what) 1
#endif
in swim3.c, which doesn't seem right.
But I'm easy as long as it gets fixed. :)
Yours Tony
linux.conf.au http://linux.conf.au/ || http://lca2008.linux.org.au/
Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!
Quoted 10 lines · Josh Boyer
Quoted 1 line
The current
pmac32_defconfigfails to build with the followingerror:
Quoted 8 lines
Building modules, stage 2.
ERROR: "check_media_bay" [drivers/block/swim3.ko] undefined!
WARNING: modpost: Found 23 section mismatch(es). To see full details build your kernel with:
'makeCONFIG_DEBUG_SECTION_MISMATCH=y'
make[2]: *** [__modpost] Error 1
Quoted 5 lines
Quoted 1 line
This patch fixes that.
Kyle posted a slightly different patch that seemed to still keep the original intention of ifdefery in tact. I've no idea which is better, but the three of you might want to compare notes.
Just remove the bloody ifdef's, they are just a useless pain.
Ben.
Quoted 8 lines · Tony Breeds
The current
pmac32_defconfigfails to build with the following error:Building modules, stage 2.
ERROR: "check_media_bay" [drivers/block/swim3.ko] undefined!
WARNING: modpost: Found 23 section mismatch(es). To see full details build your kernel with:
'makeCONFIG_DEBUG_SECTION_MISMATCH=y'
make[2]: *** [__modpost] Error 1
Bart, I told you I didn't want those ifdef's in mediabay ... they are just cluttering things and causing trouble.
Quoted 3 lines
This patch fixes that.
Signed-off-by Tony Breeds <[email protected]>
Quoted 46 lines
---
drivers/block/swim3.c | 4 ---- drivers/macintosh/mediabay.c | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-)drivers/block/swim3.c +0
-4@@ -251,10 +251,6 @@ static int floppy_release(struct inode *inode, struct file *filp);static int floppy_check_change (struct gendisk *disk);static int floppy_revalidate (struct gendisk *disk); -#ifndef CONFIG_PMAC_MEDIABAY -#define check_media_bay (which, what) 1 -#endif -static void swim3_select (struct floppy_state *fs,int sel) {struct swim3 __iomem *sw = fs->swim3;drivers/macintosh/mediabay.c +0
-2@@ -416,7 +416,6 @@ static void poll_media_bay(struct media_bay_info* bay) } } -#ifdef CONFIG_MAC_FLOPPY int check_media_bay (struct device_node *which_bay,int what) {int i;@@ -431,7 +430,6 @@ int check_media_bay(struct device_node *which_bay, int what)return -ENODEV ; }EXPORT_SYMBOL (check_media_bay); -#endif /* CONFIG_MAC_FLOPPY */ #ifdef CONFIG_BLK_DEV_IDE_PMAC int check_media_bay_by_base (unsigned long base,int what)Yours Tony
linux.conf.au http://linux.conf.au/ || http://lca2008.linux.org.au/
Jan 28 - Feb 02 2008 The Australian Linux Technical Conference!