* Re: linux-next: Tree for November 2 (usb/whci)
From: Greg KH @ 2009-11-11 17:30 UTC (permalink / raw)
To: Randy Dunlap, David Vrabel
Cc: lud, Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA, LKML
In-Reply-To: <20091111090403.5fb0229e.randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
On Wed, Nov 11, 2009 at 09:04:03AM -0800, Randy Dunlap wrote:
> On Mon, 2 Nov 2009 09:13:39 -0800 Randy Dunlap wrote:
>
> > On Mon, 2 Nov 2009 17:38:45 +1100 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Changes since 20091030: <<<<<<<<<<<<<<<<<<<<<<<<<<
> >
> >
> > whci build fails on i386 due to 64-bit multiply & divide:
> >
> > ERROR: "__udivdi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
> > ERROR: "__umoddi3" [drivers/usb/host/whci/whci-hcd.ko] undefined!
>
>
> Still present in linux-next-20091111.
David, can you please look into this and resolve it?
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH -next] pcmcia: fix printk formats
From: Randy Dunlap @ 2009-11-11 17:31 UTC (permalink / raw)
To: Stephen Rothwell, linux-pcmcia, Harald Welte
Cc: akpm, linux-next, LKML, gregkh
In-Reply-To: <20091111203159.a2a6eeeb.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix printk format warnings on sizeof() [size_t] arguments.
drivers/char/pcmcia/cm4040_cs.c:267: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'size_t'
drivers/char/pcmcia/cm4040_cs.c:272: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'size_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/char/pcmcia/cm4040_cs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20091110.orig/drivers/char/pcmcia/cm4040_cs.c
+++ linux-next-20091110/drivers/char/pcmcia/cm4040_cs.c
@@ -264,12 +264,12 @@ static ssize_t cm4040_read(struct file *
bytes_to_read = 5 + le32_to_cpu(*(__le32 *)&dev->r_buf[1]);
- DEBUGP(6, dev, "BytesToRead=%lu\n", bytes_to_read);
+ DEBUGP(6, dev, "BytesToRead=%zu\n", bytes_to_read);
min_bytes_to_read = min(count, bytes_to_read + 5);
min_bytes_to_read = min_t(size_t, min_bytes_to_read, READ_WRITE_BUFFER_SIZE);
- DEBUGP(6, dev, "Min=%lu\n", min_bytes_to_read);
+ DEBUGP(6, dev, "Min=%zu\n", min_bytes_to_read);
for (i = 0; i < (min_bytes_to_read-5); i++) {
rc = wait_for_bulk_in_ready(dev);
^ permalink raw reply
* [PATCH -next] staging/vt665*: depends on WLAN
From: Randy Dunlap @ 2009-11-11 17:31 UTC (permalink / raw)
To: Stephen Rothwell, devel; +Cc: linux-next, LKML, gregkh
In-Reply-To: <20091111203159.a2a6eeeb.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
The vt665[56] drivers can be built when CONFIG_NET=n &
CONFIG_NETDEVICES=n. This leads to build failures.
Prevent this by making them depend on WLAN.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/vt6655/Kconfig | 2 +-
drivers/staging/vt6656/Kconfig | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20091110.orig/drivers/staging/vt6655/Kconfig
+++ linux-next-20091110/drivers/staging/vt6655/Kconfig
@@ -1,6 +1,6 @@
config VT6655
tristate "VIA Technologies VT6655 support"
- depends on PCI
+ depends on PCI && WLAN
select WIRELESS_EXT
select WEXT_PRIV
---help---
--- linux-next-20091110.orig/drivers/staging/vt6656/Kconfig
+++ linux-next-20091110/drivers/staging/vt6656/Kconfig
@@ -1,6 +1,6 @@
config VT6656
tristate "VIA Technologies VT6656 support"
- depends on USB
+ depends on USB && WLAN
select WIRELESS_EXT
select WEXT_PRIV
---help---
^ permalink raw reply
* [PATCH -next] staging/rtl8192u: depends on USB
From: Randy Dunlap @ 2009-11-11 17:31 UTC (permalink / raw)
To: Stephen Rothwell, devel; +Cc: linux-next, LKML, gregkh
In-Reply-To: <20091111203159.a2a6eeeb.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
rtl8192u uses usb_* interfaces so it should depend on USB.
ERROR: "usb_kill_urb" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "usb_control_msg" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/rtl8192u/r8192u_usb.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/rtl8192u/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20091110.orig/drivers/staging/rtl8192u/Kconfig
+++ linux-next-20091110/drivers/staging/rtl8192u/Kconfig
@@ -1,6 +1,6 @@
config RTL8192U
tristate "RealTek RTL8192U Wireless LAN NIC driver"
- depends on PCI && WLAN
+ depends on PCI && WLAN && USB
depends on WIRELESS_EXT
default N
---help---
^ permalink raw reply
* [PATCH -next] staging/vt665*: fix printk formats
From: Randy Dunlap @ 2009-11-11 17:31 UTC (permalink / raw)
To: Stephen Rothwell, devel; +Cc: linux-next, LKML, gregkh
In-Reply-To: <20091111203159.a2a6eeeb.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix printk format warnings in vt665[56]:
drivers/staging/vt6655/wpa.c:150: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int'
drivers/staging/vt6655/wpa.c:181: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int'
drivers/staging/vt6656/wpa.c:150: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int'
drivers/staging/vt6656/wpa.c:181: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int'
drivers/staging/vt6656/firmware.c:804: warning: format '%ld' expects type 'long int', but argument 3 has type 'unsigned int'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/vt6655/wpa.c | 4 ++--
drivers/staging/vt6656/firmware.c | 2 +-
drivers/staging/vt6656/wpa.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--- linux-next-20091110.orig/drivers/staging/vt6656/firmware.c
+++ linux-next-20091110/drivers/staging/vt6656/firmware.c
@@ -801,7 +801,7 @@ FIRMWAREbDownload(
&(pBuffer[ii])
);
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Download firmware...%d %ld\n", ii, sizeof(abyFirmware));
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Download firmware...%d %zu\n", ii, sizeof(abyFirmware));
if (NdisStatus != STATUS_SUCCESS) {
if (pBuffer)
kfree(pBuffer);
--- linux-next-20091110.orig/drivers/staging/vt6656/wpa.c
+++ linux-next-20091110/drivers/staging/vt6656/wpa.c
@@ -147,7 +147,7 @@ WPA_ParseRSN (
if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
{
j = 0;
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %ld\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %zu\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
for(i = 0; (i < pRSN->wPKCount) && (j < sizeof(pBSSList->abyPKType)/sizeof(BYTE)); i++) {
if(pRSN->len >= 12+i*4+4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*i)
if ( !memcmp(pRSN->PKSList[i].abyOUI, abyOUI00, 4))
@@ -178,7 +178,7 @@ WPA_ParseRSN (
// overlay IE_RSN_Auth structure into correct place
pIE_RSN_Auth = (PWLAN_IE_RSN_AUTH) pRSN->PKSList[m].abyOUI;
j = 0;
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %ld\n",
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %zu\n",
pIE_RSN_Auth->wAuthCount, sizeof(pBSSList->abyAuthType));
for(i = 0; (i < pIE_RSN_Auth->wAuthCount) && (j < sizeof(pBSSList->abyAuthType)/sizeof(BYTE)); i++) {
if(pRSN->len >= 14+4+(m+i)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*i)
--- linux-next-20091110.orig/drivers/staging/vt6655/wpa.c
+++ linux-next-20091110/drivers/staging/vt6655/wpa.c
@@ -147,7 +147,7 @@ WPA_ParseRSN (
if (pRSN->len >= 12) //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)
{
j = 0;
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %ld\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wPKCount: %d, sizeof(pBSSList->abyPKType): %zu\n", pRSN->wPKCount, sizeof(pBSSList->abyPKType));
for(i = 0; (i < pRSN->wPKCount) && (j < sizeof(pBSSList->abyPKType)/sizeof(BYTE)); i++) {
if(pRSN->len >= 12+i*4+4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*i)
if ( !memcmp(pRSN->PKSList[i].abyOUI, abyOUI00, 4))
@@ -178,7 +178,7 @@ WPA_ParseRSN (
// overlay IE_RSN_Auth structure into correct place
pIE_RSN_Auth = (PWLAN_IE_RSN_AUTH) pRSN->PKSList[m].abyOUI;
j = 0;
- DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %ld\n",
+ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"wAuthCount: %d, sizeof(pBSSList->abyAuthType): %zu\n",
pIE_RSN_Auth->wAuthCount, sizeof(pBSSList->abyAuthType));
for(i = 0; (i < pIE_RSN_Auth->wAuthCount) && (j < sizeof(pBSSList->abyAuthType)/sizeof(BYTE)); i++) {
if(pRSN->len >= 14+4+(m+i)*4) { //oui1(4)+ver(2)+GKS(4)+PKSCnt(2)+PKS(4*m)+AKC(2)+AKS(4*i)
^ permalink raw reply
* Re: [PATCH -next] pcmcia: fix printk formats
From: Dominik Brodowski @ 2009-11-11 18:27 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-pcmcia, Harald Welte, linux-next, LKML,
gregkh, akpm
In-Reply-To: <20091111093107.9032f4bb.randy.dunlap@oracle.com>
Applied to the PCMCIA tree, thanks.
On Wed, Nov 11, 2009 at 09:31:07AM -0800, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix printk format warnings on sizeof() [size_t] arguments.
>
> drivers/char/pcmcia/cm4040_cs.c:267: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'size_t'
> drivers/char/pcmcia/cm4040_cs.c:272: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'size_t'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/char/pcmcia/cm4040_cs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20091110.orig/drivers/char/pcmcia/cm4040_cs.c
> +++ linux-next-20091110/drivers/char/pcmcia/cm4040_cs.c
> @@ -264,12 +264,12 @@ static ssize_t cm4040_read(struct file *
>
> bytes_to_read = 5 + le32_to_cpu(*(__le32 *)&dev->r_buf[1]);
>
> - DEBUGP(6, dev, "BytesToRead=%lu\n", bytes_to_read);
> + DEBUGP(6, dev, "BytesToRead=%zu\n", bytes_to_read);
>
> min_bytes_to_read = min(count, bytes_to_read + 5);
> min_bytes_to_read = min_t(size_t, min_bytes_to_read, READ_WRITE_BUFFER_SIZE);
>
> - DEBUGP(6, dev, "Min=%lu\n", min_bytes_to_read);
> + DEBUGP(6, dev, "Min=%zu\n", min_bytes_to_read);
>
> for (i = 0; i < (min_bytes_to_read-5); i++) {
> rc = wait_for_bulk_in_ready(dev);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with the omap tree
From: Tony Lindgren @ 2009-11-11 19:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Felipe Balbi, linux-omap
In-Reply-To: <20091111193013.9a4bca3e.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [091111 00:29]:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-omap.c between commit
> 7cb07f72711d3e10763ca7d7a9fcd7ac788aabf4 ("omap: ehci: Add platform init
> code") from the omap tree and commit
> 9e92239693d7010d2e710a445f46d6a738b09171 ("USB: host: ehci: introduce
> omap ehci-hcd driver") from the usb tree.
>
> Both commits create this file but I used the omap tree version because
> commit ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move
> remaining headers from include/mach to include/plat") from the omap tree
> moved one included header file (mach/usb.h -> plat/usb.h).
Oops, sorry. Looks like I accidentally included also drivers/usb/host/ehci-omap.c
as we were testing it in the linux-omap tree.
I'll drop the drivers/usb/host/ehci-omap.c part from my queue, it should get
integrated via Greg's queue. I'll just merge the platform init code.
Regards,
Tony
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with the omap tree
From: Tony Lindgren @ 2009-11-11 19:20 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Felipe Balbi, linux-omap
In-Reply-To: <20091111191213.GH24837@atomide.com>
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
* Tony Lindgren <tony@atomide.com> [091111 11:12]:
> * Stephen Rothwell <sfr@canb.auug.org.au> [091111 00:29]:
> > Hi Greg,
> >
> > Today's linux-next merge of the usb tree got a conflict in
> > drivers/usb/host/ehci-omap.c between commit
> > 7cb07f72711d3e10763ca7d7a9fcd7ac788aabf4 ("omap: ehci: Add platform init
> > code") from the omap tree and commit
> > 9e92239693d7010d2e710a445f46d6a738b09171 ("USB: host: ehci: introduce
> > omap ehci-hcd driver") from the usb tree.
> >
> > Both commits create this file but I used the omap tree version because
> > commit ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move
> > remaining headers from include/mach to include/plat") from the omap tree
> > moved one included header file (mach/usb.h -> plat/usb.h).
>
> Oops, sorry. Looks like I accidentally included also drivers/usb/host/ehci-omap.c
> as we were testing it in the linux-omap tree.
>
> I'll drop the drivers/usb/host/ehci-omap.c part from my queue, it should get
> integrated via Greg's queue. I'll just merge the platform init code.
Dropped anything touching drivers/usb from my patch. So no need for Greg
to do anything, the updated version of the patch below for reference.
Regards,
Tony
[-- Attachment #2: ehci-platform-init.patch --]
[-- Type: text/x-diff, Size: 8518 bytes --]
>From 83f75a0c0eca8cdfc41d9a136c57c65e8fd546af Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Tue, 10 Nov 2009 18:24:39 -0800
Subject: [PATCH] omap: Add platform init code for EHCI driver
Add platform init code for EHCI driver.
Various fixes to the original patch by Ajay Kumar Gupta <ajay.gupta@ti.com>
and Anand Gadiyar <gadiyar@ti.com>.
Overo support added by Olof Johansson <olof@lixom.net>
Beagle support added by Koen Kooi <koen@beagleboard.org>
CM-T32 support added by Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Signed-off-by: Olof Johansson <olof@lixom.net>
Acked-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Koen Kooi <koen@beagleboard.org>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 7468505..03cb4fc 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o
# Platform specific device init code
obj-y += usb-musb.o
obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
+obj-y += usb-ehci.o
onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o
obj-y += $(onenand-m) $(onenand-y)
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index a2abac9..a3c1271 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -484,6 +484,18 @@ static void enable_board_wakeup_source(void)
omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */
}
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .phy_reset = true,
+ .reset_gpio_port[0] = 57,
+ .reset_gpio_port[1] = 61,
+ .reset_gpio_port[2] = -EINVAL
+};
+
static void __init omap_3430sdp_init(void)
{
omap3430_i2c_init();
@@ -500,6 +512,7 @@ static void __init omap_3430sdp_init(void)
usb_musb_init();
board_smc91x_init();
enable_board_wakeup_source();
+ usb_ehci_init(&ehci_pdata);
}
static void __init omap_3430sdp_map_io(void)
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index e7a29e4..0a39513 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -352,6 +352,17 @@ static struct twl4030_hsmmc_info mmc[] = {
{} /* Terminator */
};
+static struct ehci_hcd_omap_platform_data ehci_pdata = {
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .phy_reset = true,
+ .reset_gpio_port[0] = -EINVAL,
+ .reset_gpio_port[1] = -EINVAL,
+ .reset_gpio_port[2] = -EINVAL
+};
+
static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
unsigned ngpio)
{
@@ -377,6 +388,12 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
cm_t35_vmmc1_supply.dev = mmc[0].dev;
cm_t35_vsim_supply.dev = mmc[0].dev;
+ /* setup USB with proper PHY reset GPIOs */
+ ehci_pdata.reset_gpio_port[0] = gpio + 6;
+ ehci_pdata.reset_gpio_port[1] = gpio + 7;
+
+ usb_ehci_init(&ehci_pdata);
+
return 0;
}
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 71a3528..6cb99f6 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -400,6 +400,18 @@ static void __init omap3beagle_flash_init(void)
}
}
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .phy_reset = true,
+ .reset_gpio_port[0] = -EINVAL,
+ .reset_gpio_port[1] = 147,
+ .reset_gpio_port[2] = -EINVAL
+};
+
static void __init omap3_beagle_init(void)
{
omap3_beagle_i2c_init();
@@ -413,6 +425,7 @@ static void __init omap3_beagle_init(void)
gpio_direction_output(170, true);
usb_musb_init();
+ usb_ehci_init(&ehci_pdata);
omap3beagle_flash_init();
/* Ensure SDRC pins are mux'd for self-refresh */
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 660ef8c..b9b0f4c 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -343,6 +343,18 @@ static struct platform_device *omap3_evm_devices[] __initdata = {
&omap3evm_smc911x_device,
};
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .phy_reset = true,
+ .reset_gpio_port[0] = -EINVAL,
+ .reset_gpio_port[1] = 135,
+ .reset_gpio_port[2] = -EINVAL
+};
+
static void __init omap3_evm_init(void)
{
omap3_evm_i2c_init();
@@ -358,6 +370,9 @@ static void __init omap3_evm_init(void)
usb_nop_xceiv_register();
#endif
usb_musb_init();
+ /* Setup EHCI phy reset padconfig */
+ omap_cfg_reg(AF4_34XX_GPIO135_OUT);
+ usb_ehci_init(&ehci_pdata);
ads7846_dev_init();
}
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 5a38494..581a18d 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -387,6 +387,18 @@ static struct platform_device *omap3pandora_devices[] __initdata = {
&pandora_keys_gpio,
};
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .phy_reset = true,
+ .reset_gpio_port[0] = 16,
+ .reset_gpio_port[1] = -EINVAL,
+ .reset_gpio_port[2] = -EINVAL
+};
+
static void __init omap3pandora_init(void)
{
omap3pandora_i2c_init();
@@ -396,6 +408,7 @@ static void __init omap3pandora_init(void)
spi_register_board_info(omap3pandora_spi_board_info,
ARRAY_SIZE(omap3pandora_spi_board_info));
omap3pandora_ads7846_init();
+ usb_ehci_init(&ehci_pdata);
pandora_keys_gpio_init();
usb_musb_init();
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 461522c..92f3f3a 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -384,6 +384,18 @@ static struct platform_device *overo_devices[] __initdata = {
&overo_lcd_device,
};
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+ .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+ .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+ .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+ .phy_reset = true,
+ .reset_gpio_port[0] = -EINVAL,
+ .reset_gpio_port[1] = OVERO_GPIO_USBH_NRESET,
+ .reset_gpio_port[2] = -EINVAL
+};
+
+
static void __init overo_init(void)
{
overo_i2c_init();
@@ -391,6 +403,7 @@ static void __init overo_init(void)
omap_serial_init();
overo_flash_init();
usb_musb_init();
+ usb_ehci_init(&ehci_pdata);
overo_ads7846_init();
overo_init_smsc911x();
@@ -433,14 +446,6 @@ static void __init overo_init(void)
else
printk(KERN_ERR "could not obtain gpio for "
"OVERO_GPIO_USBH_CPEN\n");
-
- if ((gpio_request(OVERO_GPIO_USBH_NRESET,
- "OVERO_GPIO_USBH_NRESET") == 0) &&
- (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0))
- gpio_export(OVERO_GPIO_USBH_NRESET, 0);
- else
- printk(KERN_ERR "could not obtain gpio for "
- "OVERO_GPIO_USBH_NRESET\n");
}
static void __init overo_map_io(void)
diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h
index f8d186a..4655707 100644
--- a/arch/arm/plat-omap/include/plat/omap34xx.h
+++ b/arch/arm/plat-omap/include/plat/omap34xx.h
@@ -74,8 +74,12 @@
#define OMAP34XX_IVA_INTC_BASE 0x40000000
#define OMAP34XX_HSUSB_OTG_BASE (L4_34XX_BASE + 0xAB000)
-#define OMAP34XX_HSUSB_HOST_BASE (L4_34XX_BASE + 0x64000)
#define OMAP34XX_USBTLL_BASE (L4_34XX_BASE + 0x62000)
+#define OMAP34XX_UHH_CONFIG_BASE (L4_34XX_BASE + 0x64000)
+#define OMAP34XX_OHCI_BASE (L4_34XX_BASE + 0x64400)
+#define OMAP34XX_EHCI_BASE (L4_34XX_BASE + 0x64800)
+#define OMAP34XX_SR1_BASE 0x480C9000
+#define OMAP34XX_SR2_BASE 0x480CB000
#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000)
^ permalink raw reply related
* Re: linux-next: tip tree build failure
From: Stephen Rothwell @ 2009-11-11 21:39 UTC (permalink / raw)
To: FUJITA Tomonori; +Cc: tglx, mingo, hpa, peterz, linux-next, linux-kernel
In-Reply-To: <20091112000258F.fujita.tomonori@lab.ntt.co.jp>
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi,
On Thu, 12 Nov 2009 00:03:28 +0900 FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> wrote:
>
> Duh, sorry about it. I should have complied that patchset for POWERPC
> too. POWERPC has swiotlb but it doesn't expect it to be used (POWERPC
> can remove it).
>
> I think that the following patch works. I'll do more cleanup related
> with x86 IOMMU initialization soon (I'm at JFK to go back to Japan).
Great, thanks for the fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with the omap tree
From: Stephen Rothwell @ 2009-11-11 21:52 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Greg KH, linux-next, linux-kernel, Felipe Balbi, linux-omap
In-Reply-To: <20091111192058.GI24837@atomide.com>
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
Hi Tony,
On Wed, 11 Nov 2009 11:20:59 -0800 Tony Lindgren <tony@atomide.com> wrote:
>
> * Tony Lindgren <tony@atomide.com> [091111 11:12]:
> >
> > Oops, sorry. Looks like I accidentally included also drivers/usb/host/ehci-omap.c
> > as we were testing it in the linux-omap tree.
> >
> > I'll drop the drivers/usb/host/ehci-omap.c part from my queue, it should get
> > integrated via Greg's queue. I'll just merge the platform init code.
>
> Dropped anything touching drivers/usb from my patch. So no need for Greg
> to do anything, the updated version of the patch below for reference.
OK, thanks. Just as long as we don't forget the necessary updates when
these are all integrated into Linus' tree. Some conflicts in linux-next
are not a bad thing for that reason.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: origin tree build failure
From: Stephen Rothwell @ 2009-11-12 0:23 UTC (permalink / raw)
To: Linus; +Cc: linux-next, linux-kernel, Jan Kara, Andrew Morton,
Aneesh Kumar K.V
Hi Linus,
Today's linux-next build (x86_64 allmodconfig) failed like this:
ERROR: "log_start_commit" [fs/ext3/ext3.ko] undefined!
I applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 11:19:26 +1100
Subject: [PATCH] jbd: export log_start_commit for ext3
Today's linux-next build (x86_64 allmodconfig) failed like this:
ERROR: "log_start_commit" [fs/ext3/ext3.ko] undefined!
Caused by commit fe8bc91c4c30122b357d197117705cfd4fabaf28 ("ext3: Wait
for proper transaction commit on fsync").
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/jbd/journal.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 49d5cd6..34973f6 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -461,6 +461,7 @@ int log_start_commit(journal_t *journal, tid_t tid)
spin_unlock(&journal->j_state_lock);
return ret;
}
+EXPORT_SYMBOL(log_start_commit);
/*
* Force and wait upon a commit if the calling process is not within
--
1.6.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: net tree build warning
From: Stephen Rothwell @ 2009-11-12 2:24 UTC (permalink / raw)
To: David S. Miller; +Cc: linux-next, linux-kernel, Eric Dumazet
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
Hi Dave,
Today's linux-next build (x86_64 allmodconfig) produced this warning:
net/ipv6/addrconf.c: In function 'inet6_dump_ifinfo':
net/ipv6/addrconf.c:3833: warning: unused variable 'err'
Introduced by commit 84d2697d9649339215675551eae28ba04068dea1 ("ipv6:
speedup inet6_dump_ifinfo()").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the cpufreq tree with the acpi tree
From: Stephen Rothwell @ 2009-11-12 2:45 UTC (permalink / raw)
To: Dave Jones
Cc: linux-next, linux-kernel, Thomas Renninger, Zhao Yakui, Len Brown
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
include/acpi/processor.h between commit
d81c45e1c9369855901420f79114852eba2ea16a ("ACPI: Notify the _PPC
evaluation status to the platform") from the acpi tree and commit
b02d803d0fa3a395ba32bc5e5e3e7a3385ca7237 ("[CPUFREQ] Introduce bios_limit
per cpu cpufreq sysfs interface") from the cpufreq tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
By the way, Dave, Thomas, shouldn't the second version of
acpi_processor_get_bios_limit() in include/acpi/processor.h introduced by
the above cpufreq tree patch be "static inline"?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/acpi/processor.h
index a920237,e7454b3..0000000
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@@ -294,7 -294,8 +294,8 @@@ static inline void acpi_processor_ffh_c
#ifdef CONFIG_CPU_FREQ
void acpi_processor_ppc_init(void);
void acpi_processor_ppc_exit(void);
-int acpi_processor_ppc_has_changed(struct acpi_processor *pr);
+int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag);
+ extern int acpi_processor_get_bios_limit(int cpu, unsigned int *limit);
#else
static inline void acpi_processor_ppc_init(void)
{
^ permalink raw reply
* Re: linux-next: net tree build warning
From: David Miller @ 2009-11-12 2:53 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, eric.dumazet
In-Reply-To: <20091112132424.e010e3c5.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 13:24:24 +1100
> Hi Dave,
>
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>
> net/ipv6/addrconf.c: In function 'inet6_dump_ifinfo':
> net/ipv6/addrconf.c:3833: warning: unused variable 'err'
>
> Introduced by commit 84d2697d9649339215675551eae28ba04068dea1 ("ipv6:
> speedup inet6_dump_ifinfo()").
I just pushed a fix for this into net-next-2.6, thanks!
^ permalink raw reply
* Re: linux-next: net tree build warning
From: Eric Dumazet @ 2009-11-12 2:55 UTC (permalink / raw)
To: David Miller; +Cc: sfr, linux-next, linux-kernel
In-Reply-To: <20091111.185338.253345558.davem@davemloft.net>
David Miller a écrit :
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 12 Nov 2009 13:24:24 +1100
>
>> Hi Dave,
>>
>> Today's linux-next build (x86_64 allmodconfig) produced this warning:
>>
>> net/ipv6/addrconf.c: In function 'inet6_dump_ifinfo':
>> net/ipv6/addrconf.c:3833: warning: unused variable 'err'
>>
>> Introduced by commit 84d2697d9649339215675551eae28ba04068dea1 ("ipv6:
>> speedup inet6_dump_ifinfo()").
>
> I just pushed a fix for this into net-next-2.6, thanks!
You beat me :)
Thanks
^ permalink raw reply
* Re: linux-next: net tree build warning
From: Stephen Rothwell @ 2009-11-12 3:10 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, eric.dumazet
In-Reply-To: <20091111.185338.253345558.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
Hi Dave,
On Wed, 11 Nov 2009 18:53:38 -0800 (PST) David Miller <davem@davemloft.net> wrote:
>
> I just pushed a fix for this into net-next-2.6, thanks!
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: leds tree build warning
From: Stephen Rothwell @ 2009-11-12 4:54 UTC (permalink / raw)
To: Richard Purdie
Cc: linux-next, linux-kernel, Dave Hansen, Javier Martinez Canillas
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi Richard,
Today's linux-next build (x86_64 allmodconfig) produced this warning:
drivers/leds/leds-ss4200.c: In function 'ich7_lpc_probe':
drivers/leds/leds-ss4200.c:353: warning: 'return' with no value, in function returning non-void
Introduced by commit c2b9eda77348ff17b25471ff27f680b2c205d2bf
("leds-ss4200: Check pci_enable_device return").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: i7core_edac tree build failure
From: Stephen Rothwell @ 2009-11-12 5:58 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Aristeu Rozanski, Rusty Russell
Hi Mauro,
Today's linux-next build (x86_64 allmodconfig) failed like this:
tmp_exports-asm.o: In function `__ksymtab_pci_legacy_init':
(__ksymtab_gpl_sorted+0x3120): undefined reference to `pci_legacy_init'
Caused by commit a120a84ebbc4cbc9c1addddd2b491e3683b842a6 ("pci: Add a
probing code that seeks for an specific bus") (which applies
EXPORT_SYMBOL_GPL() to a static function) interacting with the rr tree's
changes.
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 16:55:38 +1100
Subject: [PATCH] i7core_edac: do not export static functions
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/pci/legacy.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index 5e22d83..a8194c8 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -38,7 +38,6 @@ static int __init pci_legacy_init(void)
return 0;
}
-EXPORT_SYMBOL_GPL(pci_legacy_init);
void pcibios_scan_specific_bus(int busn)
{
--
1.6.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: percpu tree build warning
From: Stephen Rothwell @ 2009-11-12 6:45 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
Hi all,
Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
drivers/net/loopback.c: In function 'loopback_get_stats':
drivers/net/loopback.c:109: warning: initialization discards qualifiers from pointer target type
The line in question is:
lb_stats = per_cpu_ptr(pcpu_lstats, i);
Where "lb_stats" and "pcpu_lstats" are both "const struct pcpu_lstats
*". I guess this is because of __verify_pcpu_ptr().
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: sysctl tree build failure
From: Stephen Rothwell @ 2009-11-12 7:48 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: linux-next, linux-kernel
Hi Eric,
Today's linux-next build (powerpc allnoconfig) failed like this:
kernel/built-in.o: In function `get_sysctl':
sysctl_binary.c:(.text+0x100d4): undefined reference to `dev_get_by_index'
Caused by commit 26a7034b40ba80f82f64fa251a2cbf49f9971c6a ("sysctl:
Reduce sys_sysctl to a compatibility wrapper around /proc/sys").
CONFIG_NET is not set for this build.
I have used this patch for today:
(It does produce this warning, though:
kernel/sysctl_binary.c:1253: warning: unused variable 'net'
so needs more work.)
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 18:43:35 +1100
Subject: [PATCH] sysctl: fix build dependency on CONFIG_NET
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/sysctl_binary.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 471438b..4f58ea7 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1270,6 +1270,7 @@ repeat:
if (ctl_name == table->ctl_name)
procname = table->procname;
+#ifdef CONFIG_NET
/*
* For a wild card entry map from ifindex to network
* device name.
@@ -1279,6 +1280,7 @@ repeat:
if (dev)
procname = dev->name;
}
+#endif
if (procname) {
int len;
--
1.6.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: rr tree build failure
From: Stephen Rothwell @ 2009-11-12 7:48 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, Alan Jenkins, Sam Ravnborg
Hi Rusty,
Today's linux-next build (powerpc allnoconfig) failed like this:
scripts/mod/modpost.c:18:42: error: ../../include/linux/autoconf.h: No such file or directory
Caused by commit acd9e0c7d0b4a1cc02c27088a2b2322acc6d0793 ("module: make
MODULE_SYMBOL_PREFIX into a CONFIG option") interacting with commit
cf1320106e706875e6e14db8d5299f1d552f565e ("kbuild: move autoconf.h to
include/generated") from the kbuild tree.
I have applied the following patch for today (and will continue to use
it):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 18:33:17 +1100
Subject: [PATCH] modpost: autoconf.h has moved to include/generated
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
scripts/mod/modpost.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f6be2e9..769ea95 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -15,7 +15,7 @@
#include <stdio.h>
#include <ctype.h>
#include "modpost.h"
-#include "../../include/linux/autoconf.h"
+#include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h"
/* Some toolchains use a `_' prefix for all user symbols. */
--
1.6.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: rr tree build failure
From: Stephen Rothwell @ 2009-11-12 8:03 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, Paul Mackerras, linux-kernel, linuxppc-dev
Hi Rusty,
Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
.tmp_exports-asm.o: In function `__ksymtab_pci_alloc_consistent':
(__ksymtab_sorted+0x2a30): undefined reference to `pci_alloc_consistent'
.tmp_exports-asm.o: In function `__ksymtab_pci_free_consistent':
(__ksymtab_sorted+0x2b70): undefined reference to `pci_free_consistent'
Caused by the powerpc architecture EXPORTing static inlines (for 32 bit
builds) interacting with changes in the rr tree.
I have applied this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 12 Nov 2009 18:54:13 +1100
Subject: [PATCH] powerpc: do not export pci_alloc/free_consistent
Since they are static inline functions.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/ppc_ksyms.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 07115d6..4254514 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -96,8 +96,6 @@ EXPORT_SYMBOL(copy_4K_page);
EXPORT_SYMBOL(isa_io_base);
EXPORT_SYMBOL(isa_mem_base);
EXPORT_SYMBOL(pci_dram_offset);
-EXPORT_SYMBOL(pci_alloc_consistent);
-EXPORT_SYMBOL(pci_free_consistent);
#endif /* CONFIG_PCI */
EXPORT_SYMBOL(start_thread);
--
1.6.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* Re: linux-next: sysctl tree build failure
From: Eric W. Biederman @ 2009-11-12 8:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20091112184805.1c0720cb.sfr@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Eric,
>
> Today's linux-next build (powerpc allnoconfig) failed like this:
>
> kernel/built-in.o: In function `get_sysctl':
> sysctl_binary.c:(.text+0x100d4): undefined reference to `dev_get_by_index'
>
> Caused by commit 26a7034b40ba80f82f64fa251a2cbf49f9971c6a ("sysctl:
> Reduce sys_sysctl to a compatibility wrapper around /proc/sys").
>
> CONFIG_NET is not set for this build.
>
> I have used this patch for today:
> (It does produce this warning, though:
>
> kernel/sysctl_binary.c:1253: warning: unused variable 'net'
>
> so needs more work.)
Thank you, and my apologies. I thought I had tried it with every
applicable compile option but apparently not.
Ugh. It looks like I have a small refcount leak in that case as
well. Blind I was.
Thank you very I will have this fixed shortly.
Eric
^ permalink raw reply
* Re: linux-next: sysctl tree build failure
From: Stephen Rothwell @ 2009-11-12 8:14 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: linux-next, linux-kernel
In-Reply-To: <m1ljicp3l0.fsf@fess.ebiederm.org>
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
Hi Eric,
On Thu, 12 Nov 2009 00:08:59 -0800 ebiederm@xmission.com (Eric W. Biederman) wrote:
>
> Thank you, and my apologies. I thought I had tried it with every
> applicable compile option but apparently not.
>
> Ugh. It looks like I have a small refcount leak in that case as
> well. Blind I was.
>
> Thank you very I will have this fixed shortly.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: rr tree build warning
From: Stephen Rothwell @ 2009-11-12 8:21 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next, linux-kernel, Alan Jenkins
[-- Attachment #1: Type: text/plain, Size: 455 bytes --]
Hi Rusty,
Today's linux-next build (i386 defconfig) produced this warning:
kernel/module.c:1953: warning: 'crc_section_names' defined but not used
Introduced by commit 67260d90118a2394df528fe4e37e814d950ca5b5 ("module:
refactor symbol tables and try to reduce code size of each_symbol()").
This build has CONFIG_MODVERSIONS disabled.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox