Commit f9445a38 authored by Fengguang Wu's avatar Fengguang Wu Committed by Tony Luck

[IA64] Rename platform_name to ia64_platform_name

The macro name is too generic and conflicts with
snd_soc_dai_link.platform_name, which triggers lots of build errors.
Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0c406643
...@@ -120,7 +120,7 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); ...@@ -120,7 +120,7 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *);
# ifdef MACHVEC_PLATFORM_HEADER # ifdef MACHVEC_PLATFORM_HEADER
# include MACHVEC_PLATFORM_HEADER # include MACHVEC_PLATFORM_HEADER
# else # else
# define platform_name ia64_mv.name # define ia64_platform_name ia64_mv.name
# define platform_setup ia64_mv.setup # define platform_setup ia64_mv.setup
# define platform_cpu_init ia64_mv.cpu_init # define platform_cpu_init ia64_mv.cpu_init
# define platform_irq_init ia64_mv.irq_init # define platform_irq_init ia64_mv.irq_init
......
...@@ -10,7 +10,7 @@ extern ia64_mv_setup_t dig_setup; ...@@ -10,7 +10,7 @@ extern ia64_mv_setup_t dig_setup;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "dig" #define ia64_platform_name "dig"
#define platform_setup dig_setup #define platform_setup dig_setup
#endif /* _ASM_IA64_MACHVEC_DIG_h */ #endif /* _ASM_IA64_MACHVEC_DIG_h */
...@@ -11,7 +11,7 @@ extern ia64_mv_dma_init pci_iommu_alloc; ...@@ -11,7 +11,7 @@ extern ia64_mv_dma_init pci_iommu_alloc;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "dig_vtd" #define ia64_platform_name "dig_vtd"
#define platform_setup dig_setup #define platform_setup dig_setup
#define platform_dma_init pci_iommu_alloc #define platform_dma_init pci_iommu_alloc
......
...@@ -11,7 +11,7 @@ extern ia64_mv_irq_init_t hpsim_irq_init; ...@@ -11,7 +11,7 @@ extern ia64_mv_irq_init_t hpsim_irq_init;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "hpsim" #define ia64_platform_name "hpsim"
#define platform_setup hpsim_setup #define platform_setup hpsim_setup
#define platform_irq_init hpsim_irq_init #define platform_irq_init hpsim_irq_init
......
...@@ -11,7 +11,7 @@ extern ia64_mv_dma_init sba_dma_init; ...@@ -11,7 +11,7 @@ extern ia64_mv_dma_init sba_dma_init;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "hpzx1" #define ia64_platform_name "hpzx1"
#define platform_setup dig_setup #define platform_setup dig_setup
#define platform_dma_init sba_dma_init #define platform_dma_init sba_dma_init
......
...@@ -11,7 +11,7 @@ extern ia64_mv_dma_get_ops hwsw_dma_get_ops; ...@@ -11,7 +11,7 @@ extern ia64_mv_dma_get_ops hwsw_dma_get_ops;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "hpzx1_swiotlb" #define ia64_platform_name "hpzx1_swiotlb"
#define platform_setup dig_setup #define platform_setup dig_setup
#define platform_dma_init machvec_noop #define platform_dma_init machvec_noop
#define platform_dma_get_ops hwsw_dma_get_ops #define platform_dma_get_ops hwsw_dma_get_ops
......
...@@ -71,7 +71,7 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_fixup_bus; ...@@ -71,7 +71,7 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_fixup_bus;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "sn2" #define ia64_platform_name "sn2"
#define platform_setup sn_setup #define platform_setup sn_setup
#define platform_cpu_init sn_cpu_init #define platform_cpu_init sn_cpu_init
#define platform_irq_init sn_irq_init #define platform_irq_init sn_irq_init
......
...@@ -20,7 +20,7 @@ extern ia64_mv_setup_t uv_setup; ...@@ -20,7 +20,7 @@ extern ia64_mv_setup_t uv_setup;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "uv" #define ia64_platform_name "uv"
#define platform_setup uv_setup #define platform_setup uv_setup
#endif /* _ASM_IA64_MACHVEC_UV_H */ #endif /* _ASM_IA64_MACHVEC_UV_H */
...@@ -13,7 +13,7 @@ extern ia64_mv_send_ipi_t xen_platform_send_ipi; ...@@ -13,7 +13,7 @@ extern ia64_mv_send_ipi_t xen_platform_send_ipi;
* platform's machvec structure. When compiling a non-generic kernel, * platform's machvec structure. When compiling a non-generic kernel,
* the macros are used directly. * the macros are used directly.
*/ */
#define platform_name "xen" #define ia64_platform_name "xen"
#define platform_setup dig_setup #define platform_setup dig_setup
#define platform_cpu_init xen_cpu_init #define platform_cpu_init xen_cpu_init
#define platform_irq_init xen_irq_init #define platform_irq_init xen_irq_init
......
...@@ -719,7 +719,7 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT, ...@@ -719,7 +719,7 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT,
void default_idle(void); void default_idle(void);
#define ia64_platform_is(x) (strcmp(x, platform_name) == 0) #define ia64_platform_is(x) (strcmp(x, ia64_platform_name) == 0)
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
......
...@@ -30,8 +30,8 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev) ...@@ -30,8 +30,8 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev)
struct pci_bus *bus; struct pci_bus *bus;
u16 config; u16 config;
if ((strcmp(platform_name, "dig") != 0) if ((strcmp(ia64_platform_name, "dig") != 0)
&& (strcmp(platform_name, "hpzx1") != 0)) && (strcmp(ia64_platform_name, "hpzx1") != 0))
return; return;
/* Maybe, this machine supports legacy memory map. */ /* Maybe, this machine supports legacy memory map. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment