summaryrefslogtreecommitdiff
path: root/arch/x86/pci/direct.c
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2011-09-15 08:58:51 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2011-10-14 09:05:28 -0700
commit72da0b07b1b497927758a2102b856ce41e4ba81e (patch)
treead8e8f895c60fb2dfe0d5922e7c9ca9e8b75e6fe /arch/x86/pci/direct.c
parenta94d072b20239f6f615dc20f0a54f63e9b642f9e (diff)
downloadlinux-3.10-72da0b07b1b497927758a2102b856ce41e4ba81e.tar.gz
linux-3.10-72da0b07b1b497927758a2102b856ce41e4ba81e.tar.bz2
linux-3.10-72da0b07b1b497927758a2102b856ce41e4ba81e.zip
x86: constify PCI raw ops structures
As with any other such change, the goal is to prevent inadvertent writes to these structures (assuming DEBUG_RODATA is enabled), and to separate data (possibly frequently) written to from such never getting modified. Reviewed-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/direct.c')
-rw-r--r--arch/x86/pci/direct.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
index 4f2c70439d7..15460590b8c 100644
--- a/arch/x86/pci/direct.c
+++ b/arch/x86/pci/direct.c
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus,
#undef PCI_CONF1_ADDRESS
-struct pci_raw_ops pci_direct_conf1 = {
+const struct pci_raw_ops pci_direct_conf1 = {
.read = pci_conf1_read,
.write = pci_conf1_write,
};
@@ -175,7 +175,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus,
#undef PCI_CONF2_ADDRESS
-struct pci_raw_ops pci_direct_conf2 = {
+static const struct pci_raw_ops pci_direct_conf2 = {
.read = pci_conf2_read,
.write = pci_conf2_write,
};
@@ -191,7 +191,7 @@ struct pci_raw_ops pci_direct_conf2 = {
* This should be close to trivial, but it isn't, because there are buggy
* chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.
*/
-static int __init pci_sanity_check(struct pci_raw_ops *o)
+static int __init pci_sanity_check(const struct pci_raw_ops *o)
{
u32 x = 0;
int year, devfn;