From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] PCI fixes for 2.6.0-test7
Date: Wed, 15 Oct 2003 11:24:49 -0700 [thread overview]
Message-ID: <10662422891492@kroah.com> (raw)
In-Reply-To: <20031015182321.GA22284@kroah.com>
ChangeSet 1.1347.1.1, 2003/10/13 11:05:52-07:00, greg@kroah.com
PCI: fix up probe functions for agp drivers
Can not be marked __init, must be marked __devinit or not at all.
If it is marked __init, then oops can happen by a user writing to the
"new_id" file from sysfs.
drivers/char/agp/ali-agp.c | 4 ++--
drivers/char/agp/amd-k7-agp.c | 6 +++---
drivers/char/agp/amd64-agp.c | 10 +++++-----
drivers/char/agp/ati-agp.c | 6 +++---
drivers/char/agp/i460-agp.c | 4 ++--
drivers/char/agp/intel-agp.c | 4 ++--
drivers/char/agp/nvidia-agp.c | 4 ++--
drivers/char/agp/sis-agp.c | 6 +++---
drivers/char/agp/sworks-agp.c | 4 ++--
drivers/char/agp/uninorth-agp.c | 6 +++---
drivers/char/agp/via-agp.c | 6 +++---
11 files changed, 30 insertions(+), 30 deletions(-)
diff -Nru a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
--- a/drivers/char/agp/ali-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/ali-agp.c Wed Oct 15 11:18:51 2003
@@ -231,7 +231,7 @@
};
-static struct agp_device_ids ali_agp_device_ids[] __initdata =
+static struct agp_device_ids ali_agp_device_ids[] __devinitdata =
{
{
.device_id = PCI_DEVICE_ID_AL_M1541,
@@ -272,7 +272,7 @@
{ }, /* dummy final entry, always present */
};
-static int __init agp_ali_probe(struct pci_dev *pdev,
+static int __devinit agp_ali_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct agp_device_ids *devs = ali_agp_device_ids;
diff -Nru a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd-k7-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/amd-k7-agp.c Wed Oct 15 11:18:51 2003
@@ -365,7 +365,7 @@
.agp_destroy_page = agp_generic_destroy_page,
};
-static struct agp_device_ids amd_agp_device_ids[] __initdata =
+static struct agp_device_ids amd_agp_device_ids[] __devinitdata =
{
{
.device_id = PCI_DEVICE_ID_AMD_FE_GATE_7006,
@@ -382,8 +382,8 @@
{ }, /* dummy final entry, always present */
};
-static int __init agp_amdk7_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_amdk7_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_device_ids *devs = amd_agp_device_ids;
struct agp_bridge_data *bridge;
diff -Nru a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
--- a/drivers/char/agp/amd64-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/amd64-agp.c Wed Oct 15 11:18:51 2003
@@ -248,7 +248,7 @@
};
/* Some basic sanity checks for the aperture. */
-static int __init aperture_valid(u64 aper, u32 size)
+static int __devinit aperture_valid(u64 aper, u32 size)
{
static int not_first_call;
u32 pfn, c;
@@ -297,7 +297,7 @@
* to allocate that much memory. But at least error out cleanly instead of
* crashing.
*/
-static __init int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
+static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp,
u16 cap)
{
u32 aper_low, aper_hi;
@@ -339,7 +339,7 @@
return 0;
}
-static __init int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
+static __devinit int cache_nbs (struct pci_dev *pdev, u32 cap_ptr)
{
struct pci_dev *loop_dev = NULL;
int i = 0;
@@ -365,8 +365,8 @@
return i == 0 ? -1 : 0;
}
-static int __init agp_amd64_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_amd64_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_bridge_data *bridge;
u8 rev_id;
diff -Nru a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
--- a/drivers/char/agp/ati-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/ati-agp.c Wed Oct 15 11:18:51 2003
@@ -403,7 +403,7 @@
};
-static struct agp_device_ids ati_agp_device_ids[] __initdata =
+static struct agp_device_ids ati_agp_device_ids[] __devinitdata =
{
{
.device_id = PCI_DEVICE_ID_ATI_RS100,
@@ -436,8 +436,8 @@
{ }, /* dummy final entry, always present */
};
-static int __init agp_ati_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_ati_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_device_ids *devs = ati_agp_device_ids;
struct agp_bridge_data *bridge;
diff -Nru a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
--- a/drivers/char/agp/i460-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/i460-agp.c Wed Oct 15 11:18:51 2003
@@ -560,8 +560,8 @@
.cant_use_aperture = 1,
};
-static int __init agp_intel_i460_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_intel_i460_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_bridge_data *bridge;
u8 cap_ptr;
diff -Nru a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/intel-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/intel-agp.c Wed Oct 15 11:18:51 2003
@@ -1232,8 +1232,8 @@
return 1;
}
-static int __init agp_intel_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_intel_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_bridge_data *bridge;
char *name = "(unknown)";
diff -Nru a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
--- a/drivers/char/agp/nvidia-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/nvidia-agp.c Wed Oct 15 11:18:51 2003
@@ -250,8 +250,8 @@
.agp_destroy_page = agp_generic_destroy_page,
};
-static int __init agp_nvidia_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_nvidia_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_bridge_data *bridge;
u8 cap_ptr;
diff -Nru a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
--- a/drivers/char/agp/sis-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/sis-agp.c Wed Oct 15 11:18:51 2003
@@ -95,7 +95,7 @@
.agp_destroy_page = agp_generic_destroy_page,
};
-static struct agp_device_ids sis_agp_device_ids[] __initdata =
+static struct agp_device_ids sis_agp_device_ids[] __devinitdata =
{
{
.device_id = PCI_DEVICE_ID_SI_530,
@@ -164,8 +164,8 @@
{ }, /* dummy final entry, always present */
};
-static int __init agp_sis_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_sis_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_device_ids *devs = sis_agp_device_ids;
struct agp_bridge_data *bridge;
diff -Nru a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
--- a/drivers/char/agp/sworks-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/sworks-agp.c Wed Oct 15 11:18:51 2003
@@ -437,8 +437,8 @@
.agp_destroy_page = agp_generic_destroy_page,
};
-static int __init agp_serverworks_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_serverworks_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_bridge_data *bridge;
struct pci_dev *bridge_dev;
diff -Nru a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
--- a/drivers/char/agp/uninorth-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/uninorth-agp.c Wed Oct 15 11:18:51 2003
@@ -282,7 +282,7 @@
.cant_use_aperture = 1,
};
-static struct agp_device_ids uninorth_agp_device_ids[] __initdata = {
+static struct agp_device_ids uninorth_agp_device_ids[] __devinitdata = {
{
.device_id = PCI_DEVICE_ID_APPLE_UNI_N_AGP,
.chipset_name = "UniNorth",
@@ -301,8 +301,8 @@
},
};
-static int __init agp_uninorth_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_device_ids *devs = uninorth_agp_device_ids;
struct agp_bridge_data *bridge;
diff -Nru a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
--- a/drivers/char/agp/via-agp.c Wed Oct 15 11:18:51 2003
+++ b/drivers/char/agp/via-agp.c Wed Oct 15 11:18:51 2003
@@ -211,7 +211,7 @@
.agp_destroy_page = agp_generic_destroy_page,
};
-static struct agp_device_ids via_agp_device_ids[] __initdata =
+static struct agp_device_ids via_agp_device_ids[] __devinitdata =
{
{
.device_id = PCI_DEVICE_ID_VIA_82C597_0,
@@ -371,8 +371,8 @@
}
-static int __init agp_via_probe(struct pci_dev *pdev,
- const struct pci_device_id *ent)
+static int __devinit agp_via_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
struct agp_device_ids *devs = via_agp_device_ids;
struct agp_bridge_data *bridge;
next prev parent reply other threads:[~2003-10-15 18:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-10-15 18:23 [BK PATCH] PCI fixes for 2.6.0-test7 Greg KH
2003-10-15 18:24 ` Greg KH [this message]
2003-10-15 18:24 ` [PATCH] " Greg KH
2003-10-15 18:24 ` Greg KH
2003-10-15 18:24 ` Greg KH
2003-10-15 18:24 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10662422891492@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.