[PATCH] sonicvibes: fix initdata references

From: Randy.Dunlap (rddunlap_at_osdl.org)
Date: 02/28/05

  • Next message: Jeff Garzik: "Re: [ patch 6/7] drivers/serial/jsm: new serial device driver" 
    Date:	Sun, 27 Feb 2005 16:31:45 -0800
To: torvalds <torvalds@osdl.org>

    sonicvibes: _devinit function was referencing __initdata (2x),
    which should be __devinitdata;

    Error: ./sound/oss/sonicvibes.o .text refers to 0000000000003ca7 R_X86_64_32S .init.data+0x0000000000000080 Error: ./sound/oss/sonicvibes.o .text refers to 00000000000043eb R_X86_64_32S .init.data+0x0000000000000024 Error: ./sound/oss/sonicvibes.o .text refers to 00000000000043f2 R_X86_64_32S .init.data+0x0000000000000020

    Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

    diffstat:=
     sound/oss/sonicvibes.c | 4 ++--
     1 files changed, 2 insertions(+), 2 deletions(-)

    diff -Naurp ./sound/oss/sonicvibes.c~sonicvibes_sections ./sound/oss/sonicvibes.c
    --- ./sound/oss/sonicvibes.c~sonicvibes_sections 2005-02-27 12:54:07.380801392 -0800
    +++ ./sound/oss/sonicvibes.c 2005-02-27 16:37:45.282970208 -0800
    @@ -2470,7 +2470,7 @@ MODULE_LICENSE("GPL");
     static struct initvol {
             int mixch;
             int vol;
    -} initvol[] __initdata = {
    +} initvol[] __devinitdata = {
             { SOUND_MIXER_WRITE_RECLEV, 0x4040 },
             { SOUND_MIXER_WRITE_LINE1, 0x4040 },
             { SOUND_MIXER_WRITE_CD, 0x4040 },
    @@ -2487,7 +2487,7 @@ static struct initvol {
     
     static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id *pciid)
     {
    - static char __initdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
    + static char __devinitdata sv_ddma_name[] = "S3 Inc. SonicVibes DDMA Controller";
                    struct sv_state *s;
             mm_segment_t fs;
             int i, val, ret; 

    ---
-
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/
  • Next message: Jeff Garzik: "Re: [ patch 6/7] drivers/serial/jsm: new serial device driver"

    Relevant Pages