<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">
From: Jaka Mocnik &lt;jaka@activetools.si&gt;

Initialize a few spin locks that are being reported as accessed prior to
initalization on an embedded ppc system.

(and trim some trailing whitespace)

Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
---

 25-akpm/drivers/net/gianfar.c                   |    2 ++
 25-akpm/drivers/serial/cpm_uart/cpm_uart_core.c |   18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff -puN drivers/net/gianfar.c~initialize-spin-locks drivers/net/gianfar.c
--- 25/drivers/net/gianfar.c~initialize-spin-locks	2005-03-03 02:25:11.000000000 -0800
+++ 25-akpm/drivers/net/gianfar.c	2005-03-03 02:25:11.000000000 -0800
@@ -377,6 +377,8 @@ static int init_phy(struct net_device *d
 			ADVERTISED_1000baseT_Full);
 	mii_info-&gt;autoneg = 1;
 
+	spin_lock_init(&amp;mii_info-&gt;mdio_lock);
+
 	mii_info-&gt;mii_id = priv-&gt;einfo-&gt;phyid;
 
 	mii_info-&gt;dev = dev;
diff -puN drivers/serial/cpm_uart/cpm_uart_core.c~initialize-spin-locks drivers/serial/cpm_uart/cpm_uart_core.c
--- 25/drivers/serial/cpm_uart/cpm_uart_core.c~initialize-spin-locks	2005-03-03 02:25:11.000000000 -0800
+++ 25-akpm/drivers/serial/cpm_uart/cpm_uart_core.c	2005-03-03 02:25:11.000000000 -0800
@@ -864,11 +864,12 @@ struct uart_cpm_port cpm_uart_ports[UART
 			.irq		= SMC1_IRQ,
 			.ops		= &amp;cpm_uart_pops,
 			.iotype		= SERIAL_IO_MEM,
+			.lock		= SPIN_LOCK_UNLOCKED,
 		},
 		.flags = FLAG_SMC,
 		.tx_nrfifos = TX_NUM_FIFO,
 		.tx_fifosize = TX_BUF_SIZE,
-		.rx_nrfifos = RX_NUM_FIFO, 
+		.rx_nrfifos = RX_NUM_FIFO,
 		.rx_fifosize = RX_BUF_SIZE,
 		.set_lineif = smc1_lineif,
 	},
@@ -877,11 +878,12 @@ struct uart_cpm_port cpm_uart_ports[UART
 			.irq		= SMC2_IRQ,
 			.ops		= &amp;cpm_uart_pops,
 			.iotype		= SERIAL_IO_MEM,
+			.lock		= SPIN_LOCK_UNLOCKED,
 		},
 		.flags = FLAG_SMC,
 		.tx_nrfifos = TX_NUM_FIFO,
 		.tx_fifosize = TX_BUF_SIZE,
-		.rx_nrfifos = RX_NUM_FIFO, 
+		.rx_nrfifos = RX_NUM_FIFO,
 		.rx_fifosize = RX_BUF_SIZE,
 		.set_lineif = smc2_lineif,
 #ifdef CONFIG_SERIAL_CPM_ALT_SMC2
@@ -893,10 +895,11 @@ struct uart_cpm_port cpm_uart_ports[UART
 			.irq		= SCC1_IRQ,
 			.ops		= &amp;cpm_uart_pops,
 			.iotype		= SERIAL_IO_MEM,
+			.lock		= SPIN_LOCK_UNLOCKED,
 		},
 		.tx_nrfifos = TX_NUM_FIFO,
 		.tx_fifosize = TX_BUF_SIZE,
-		.rx_nrfifos = RX_NUM_FIFO, 
+		.rx_nrfifos = RX_NUM_FIFO,
 		.rx_fifosize = RX_BUF_SIZE,
 		.set_lineif = scc1_lineif,
 	},
@@ -905,10 +908,11 @@ struct uart_cpm_port cpm_uart_ports[UART
 			.irq		= SCC2_IRQ,
 			.ops		= &amp;cpm_uart_pops,
 			.iotype		= SERIAL_IO_MEM,
+			.lock		= SPIN_LOCK_UNLOCKED,
 		},
 		.tx_nrfifos = TX_NUM_FIFO,
 		.tx_fifosize = TX_BUF_SIZE,
-		.rx_nrfifos = RX_NUM_FIFO, 
+		.rx_nrfifos = RX_NUM_FIFO,
 		.rx_fifosize = RX_BUF_SIZE,
 		.set_lineif = scc2_lineif,
 	},
@@ -917,10 +921,11 @@ struct uart_cpm_port cpm_uart_ports[UART
 			.irq		= SCC3_IRQ,
 			.ops		= &amp;cpm_uart_pops,
 			.iotype		= SERIAL_IO_MEM,
+			.lock		= SPIN_LOCK_UNLOCKED,
 		},
 		.tx_nrfifos = TX_NUM_FIFO,
 		.tx_fifosize = TX_BUF_SIZE,
-		.rx_nrfifos = RX_NUM_FIFO, 
+		.rx_nrfifos = RX_NUM_FIFO,
 		.rx_fifosize = RX_BUF_SIZE,
 		.set_lineif = scc3_lineif,
 	},
@@ -929,10 +934,11 @@ struct uart_cpm_port cpm_uart_ports[UART
 			.irq		= SCC4_IRQ,
 			.ops		= &amp;cpm_uart_pops,
 			.iotype		= SERIAL_IO_MEM,
+			.lock		= SPIN_LOCK_UNLOCKED,
 		},
 		.tx_nrfifos = TX_NUM_FIFO,
 		.tx_fifosize = TX_BUF_SIZE,
-		.rx_nrfifos = RX_NUM_FIFO, 
+		.rx_nrfifos = RX_NUM_FIFO,
 		.rx_fifosize = RX_BUF_SIZE,
 		.set_lineif = scc4_lineif,
 	},
_
</pre></body></html>