| 
					
				 | 
			
			
				@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 --- a/drivers/net/phy/mdio_bus.c 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 +++ b/drivers/net/phy/mdio_bus.c 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -493,6 +493,55 @@ struct phy_device *mdiobus_scan(struct m 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  EXPORT_SYMBOL(mdiobus_scan); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  /** 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -75,7 +75,7 @@ Signed-off-by: David S. Miller <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   * mdiobus_read_nested - Nested version of the mdiobus_read function 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   * @bus: the mii_bus struct 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   * @addr: the phy address 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -512,11 +561,9 @@ int mdiobus_read_nested(struct mii_bus * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	BUG_ON(in_interrupt()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	return retval; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  EXPORT_SYMBOL(mdiobus_read_nested); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -538,11 +585,9 @@ int mdiobus_read(struct mii_bus *bus, in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	BUG_ON(in_interrupt()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	mutex_lock(&bus->mdio_lock); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	return retval; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  EXPORT_SYMBOL(mdiobus_read); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -568,11 +613,9 @@ int mdiobus_write_nested(struct mii_bus 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	BUG_ON(in_interrupt()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <[email protected]> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	return err; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  EXPORT_SYMBOL(mdiobus_write_nested); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-@@ -595,11 +638,9 @@ int mdiobus_write(struct mii_bus *bus, i 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	BUG_ON(in_interrupt()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  	mutex_lock(&bus->mdio_lock); 
			 |