[PATCH 0/2] Two Octeon compile errors with 2.6.32-rc1

[PATCH 0/2] Two Octeon compile errors with 2.6.32-rc1

[David Daney]

Ralf,

There are a couple of problems I found with 2.6.32-rc1.

Two trivial patches to follow.

David Daney

[PATCH 1/2] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/smp.c

[David Daney]

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/cavium-octeon/smp.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 32d51a3..c198efd 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -65,11 +65,12 @@ void octeon_send_ipi_single(int cpu, unsigned int action)
 	cvmx_write_csr(CVMX_CIU_MBOX_SETX(coreid), action);
 }
 
-static inline void octeon_send_ipi_mask(cpumask_t mask, unsigned int action)
+static inline void octeon_send_ipi_mask(const struct cpumask *mask,
+					unsigned int action)
 {
 	unsigned int i;
 
-	for_each_cpu_mask(i, mask)
+	for_each_cpu_mask(i, *mask)
 		octeon_send_ipi_single(i, action);
 }
 
-- 
1.6.0.6

[PATCH 2/2] MIPS: Octeon: Fix compile error in drivers/staging/octeon/ethernet-mdio.c

[David Daney]

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 drivers/staging/octeon/ethernet-mdio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 42230e6..31a58e5 100644
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -170,7 +170,7 @@ static u32 cvm_oct_get_link(struct net_device *dev)
 	return ret;
 }
 
-struct const ethtool_ops cvm_oct_ethtool_ops = {
+const struct ethtool_ops cvm_oct_ethtool_ops = {
 	.get_drvinfo = cvm_oct_get_drvinfo,
 	.get_settings = cvm_oct_get_settings,
 	.set_settings = cvm_oct_set_settings,
-- 
1.6.0.6

Re: [PATCH 0/2] Two Octeon compile errors with 2.6.32-rc1

[Ralf Baechle]

On Thu, Oct 01, 2009 at 04:47:01PM -0700, David Daney wrote:

> There are a couple of problems I found with 2.6.32-rc1.
>
> Two trivial patches to follow.

Thanks, both applied.

  Ralf