diff options
-rw-r--r-- | arch/x86/include/asm/calgary.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/calgary.h b/arch/x86/include/asm/calgary.h index 0d467b338835..a8303ebe089f 100644 --- a/arch/x86/include/asm/calgary.h +++ b/arch/x86/include/asm/calgary.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <asm/types.h> | 31 | #include <asm/types.h> |
32 | 32 | ||
33 | struct iommu_table { | 33 | struct iommu_table { |
34 | struct cal_chipset_ops *chip_ops; /* chipset specific funcs */ | 34 | const struct cal_chipset_ops *chip_ops; /* chipset specific funcs */ |
35 | unsigned long it_base; /* mapped address of tce table */ | 35 | unsigned long it_base; /* mapped address of tce table */ |
36 | unsigned long it_hint; /* Hint for next alloc */ | 36 | unsigned long it_hint; /* Hint for next alloc */ |
37 | unsigned long *it_map; /* A simple allocation bitmap for now */ | 37 | unsigned long *it_map; /* A simple allocation bitmap for now */ |
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 0497f719977d..833b1d329c47 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c | |||
@@ -180,13 +180,13 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl); | |||
180 | static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl); | 180 | static void calgary_init_bitmap_from_tce_table(struct iommu_table *tbl); |
181 | static void get_tce_space_from_tar(void); | 181 | static void get_tce_space_from_tar(void); |
182 | 182 | ||
183 | static struct cal_chipset_ops calgary_chip_ops = { | 183 | static const struct cal_chipset_ops calgary_chip_ops = { |
184 | .handle_quirks = calgary_handle_quirks, | 184 | .handle_quirks = calgary_handle_quirks, |
185 | .tce_cache_blast = calgary_tce_cache_blast, | 185 | .tce_cache_blast = calgary_tce_cache_blast, |
186 | .dump_error_regs = calgary_dump_error_regs | 186 | .dump_error_regs = calgary_dump_error_regs |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static struct cal_chipset_ops calioc2_chip_ops = { | 189 | static const struct cal_chipset_ops calioc2_chip_ops = { |
190 | .handle_quirks = calioc2_handle_quirks, | 190 | .handle_quirks = calioc2_handle_quirks, |
191 | .tce_cache_blast = calioc2_tce_cache_blast, | 191 | .tce_cache_blast = calioc2_tce_cache_blast, |
192 | .dump_error_regs = calioc2_dump_error_regs | 192 | .dump_error_regs = calioc2_dump_error_regs |