* Re: linux-next: build failure after merge of the moduleh tree
From: Chris Ball @ 2011-10-09 18:01 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linux-next, linux-kernel, Per Forlin, Stephen Rothwell,
Akinobu Mita
In-Reply-To: <20111009050809.GS19986@windriver.com>
Hi Paul,
On Sun, Oct 09 2011, Paul Gortmaker wrote:
> I was wondering if you were going to apply this to the mmc tree. Since
> the module_param addition isn't in the module.h baseline, I'd be
> speculatively fixing an issue that hasn't been created yet, which isn't
> the end of the world, but it doesn't feel quite right to do that either.
Thanks, I've pushed both this patch and "Add module.h to drivers/mmc
users assuming implicit presence" to the mmc-next tree now.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply
* (unknown),
From: MONEY GRAM CUSTOMER CARE @ 2011-10-09 20:56 UTC (permalink / raw)
MONEY GRAM SERVICE
My associate Mr Mark Jefferson has helped me to send your first payment of
$7,500 USD to you as instructed by the United Kingdom Government and Mr.
David Cameron the United Kingdom prime minister after the last G20
meeting, making you one of the beneficiaries through an email natural
simple ballot selection.
He told Allan Davis to keep sending you $7,500 USD via Money Gram twice a
week until the FULL payment of ($820,000.00 ) is completed.
MONEY TRANSFER REFERENCE:2116-3297
SENDER'S NAME: Mark Jefferson
AMOUNT: US $7,500
To track your funds forward money gram
Transfer agent Mr Allan Davis
Your Name.____________
Phone .______________
Country_______________
Contact Allan Davis for the funds clearance
certificate (FCC) necessary for the release of your funds
E-mail m_gram22@ozledim.net
D/L: + {44}70-45-78-97-78
You cannot pickup the money until the certificate is obtained by you.
Note: that if you are not the owner of this appropriate e-mail address
then kindly ignore this message.
Regards
Mr. Forlan Desmond.
^ permalink raw reply
* Re: [PATCH -next] usb gadget: fix langwell_udc.c build error
From: Felipe Balbi @ 2011-10-09 22:36 UTC (permalink / raw)
To: Randy Dunlap
Cc: balbi, Stephen Rothwell, linux-next, LKML, linux-usb,
Andrew Morton
In-Reply-To: <4E91DF00.8060107@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]
Hi,
On Sun, Oct 09, 2011 at 10:50:56AM -0700, Randy Dunlap wrote:
> On 10/08/11 03:03, Felipe Balbi wrote:
> > Hi,
> >
> > On Fri, Oct 07, 2011 at 01:57:42PM -0700, Randy Dunlap wrote:
> >> From: Randy Dunlap <rdunlap@xenotime.net>
> >>
> >> Move function to fix langwell_udc.c build error:
> >>
> >> drivers/usb/gadget/langwell_udc.c: In function 'show_langwell_udc':
> >> drivers/usb/gadget/langwell_udc.c:1693:3: error: implicit declaration of function 'lpm_device_speed'
> >> drivers/usb/gadget/langwell_udc.c: At top level:
> >> drivers/usb/gadget/langwell_udc.c:2637:37: error: conflicting types for 'lpm_device_speed'
> >> drivers/usb/gadget/langwell_udc.c:1693:20: note: previous implicit declaration of 'lpm_device_speed' was here
> >
> > I don't have this compile error on my branch, did something go in
> > without me noticing ?
>
> probably not. What version of gcc are you using?
I believe it did, I don't have lpm_device_speed() at all.
> I'm using 4.5.1.
4.6.1
> > Can you blame a comit which introduced this ?
>
> I don't see such a commit.
$ git log --pretty=oneline -S'lpm_device_speed' HEAD -- \
drivers/usb/gadget/langwell_udc.c
what's the output ?
> > btw, all I have is a warning.
>
> What warning?
drivers/usb/gadget/langwell_udc.c: In function ‘langwell_ep_dequeue’:
drivers/usb/gadget/langwell_udc.c:919:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH -next] usb gadget: fix langwell_udc.c build error
From: Randy Dunlap @ 2011-10-09 23:05 UTC (permalink / raw)
To: balbi
Cc: Stephen Rothwell, linux-next, LKML, linux-usb, Andrew Morton,
Michal Nazarewicz
In-Reply-To: <20111009223638.GA29776@legolas.emea.dhcp.ti.com>
On 10/09/11 15:36, Felipe Balbi wrote:
> git log --pretty=oneline -S'lpm_device_speed' HEAD -- \
> drivers/usb/gadget/langwell_udc.c
e538dfdae85244fd2c4231725d82cc1f1bc4942c usb: Provide usb_speed_string() function
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* linux-next: no tree for today
From: Stephen Rothwell @ 2011-10-09 23:17 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
Hi all,
There will be no linux-next tree today due to a public holiday here.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH -next] usb gadget: fix langwell_udc.c build error
From: Stephen Rothwell @ 2011-10-09 23:33 UTC (permalink / raw)
To: balbi; +Cc: Randy Dunlap, linux-next, LKML, linux-usb, Andrew Morton
In-Reply-To: <20111008100326.GA24633@legolas.emea.dhcp.ti.com>
[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]
Hi,
On Sat, 8 Oct 2011 13:03:28 +0300 Felipe Balbi <balbi@ti.com> wrote:
>
> On Fri, Oct 07, 2011 at 01:57:42PM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <rdunlap@xenotime.net>
> >
> > Move function to fix langwell_udc.c build error:
> >
> > drivers/usb/gadget/langwell_udc.c: In function 'show_langwell_udc':
> > drivers/usb/gadget/langwell_udc.c:1693:3: error: implicit declaration of function 'lpm_device_speed'
> > drivers/usb/gadget/langwell_udc.c: At top level:
> > drivers/usb/gadget/langwell_udc.c:2637:37: error: conflicting types for 'lpm_device_speed'
> > drivers/usb/gadget/langwell_udc.c:1693:20: note: previous implicit declaration of 'lpm_device_speed' was here
>
> I don't have this compile error on my branch, did something go in
> without me noticing ?
>
> Can you blame a comit which introduced this ?
>
> btw, all I have is a warning.
The code in that file is structured like this (in linux-next and the usb
tree):
static ssize_t show_langwell_udc(struct device *_dev,
struct device_attribute *attr, char *buf)
{
...
t = scnprintf(next, size,
"Device LPM Control Reg:\n"
"Parallel Transceiver : %d\n"
"Serial Transceiver : %d\n"
"Port Speed: %s\n"
"Port Force Full Speed Connenct: %s\n"
"PHY Low Power Suspend Clock: %s\n"
"BmAttributes: %d\n\n",
LPM_PTS(tmp_reg),
(tmp_reg & LPM_STS) ? 1 : 0,
usb_speed_string(lpm_device_speed(tmp_reg)),
(tmp_reg & LPM_PFSC) ? "Force Full Speed" : "Not Force",
(tmp_reg & LPM_PHCD) ? "Disabled" : "Enabled",
LPM_BA(tmp_reg));
...
}
...
static inline enum usb_device_speed lpm_device_speed(u32 reg)
{
...
}
So this function is clearly used before it is declared. What does yours
look like?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH -next] usb gadget: fix langwell_udc.c build error
From: Felipe Balbi @ 2011-10-10 5:10 UTC (permalink / raw)
To: Randy Dunlap
Cc: balbi-l0cyMroinI0, Stephen Rothwell,
linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
linux-usb-u79uwXL29TY76Z2rM5mHXA, Andrew Morton,
Michal Nazarewicz
In-Reply-To: <4E9228CA.1060904-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 607 bytes --]
Hi,
On Sun, Oct 09, 2011 at 04:05:46PM -0700, Randy Dunlap wrote:
> On 10/09/11 15:36, Felipe Balbi wrote:
> > git log --pretty=oneline -S'lpm_device_speed' HEAD -- \
> > drivers/usb/gadget/langwell_udc.c
>
> e538dfdae85244fd2c4231725d82cc1f1bc4942c usb: Provide usb_speed_string() function
Aha, now I know why, that went straight througth Greg.
Greg, can you pick this patch ? It's clearly needed. Meanwhile, I'll
cherry-pick that commit from your tree and apply Randy's fix too.
Here's my ack for $SUBJECT:
Acked-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH -next] usb gadget: fix langwell_udc.c build error
From: Greg KH @ 2011-10-10 17:16 UTC (permalink / raw)
To: Felipe Balbi
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, linux-usb,
Andrew Morton, Michal Nazarewicz
In-Reply-To: <20111010050959.GA30935@legolas.emea.dhcp.ti.com>
On Mon, Oct 10, 2011 at 08:10:01AM +0300, Felipe Balbi wrote:
> Hi,
>
> On Sun, Oct 09, 2011 at 04:05:46PM -0700, Randy Dunlap wrote:
> > On 10/09/11 15:36, Felipe Balbi wrote:
> > > git log --pretty=oneline -S'lpm_device_speed' HEAD -- \
> > > drivers/usb/gadget/langwell_udc.c
> >
> > e538dfdae85244fd2c4231725d82cc1f1bc4942c usb: Provide usb_speed_string() function
>
> Aha, now I know why, that went straight througth Greg.
>
> Greg, can you pick this patch ? It's clearly needed. Meanwhile, I'll
> cherry-pick that commit from your tree and apply Randy's fix too.
>
> Here's my ack for $SUBJECT:
>
> Acked-by: Felipe Balbi <balbi@ti.com>
Um, pick what patch?
Randy, care to resend it to me with Felipe's ack?
thanks,
greg k-h
^ permalink raw reply
* [PATCH -next] usb gadget: fix langwell_udc.c build error
From: Randy Dunlap @ 2011-10-10 17:40 UTC (permalink / raw)
To: Greg KH
Cc: Felipe Balbi, Stephen Rothwell, linux-next, LKML, linux-usb,
Andrew Morton, Michal Nazarewicz
In-Reply-To: <20111010171645.GA24628@kroah.com>
From: Randy Dunlap <rdunlap@xenotime.net>
Move function to fix langwell_udc.c build error:
drivers/usb/gadget/langwell_udc.c: In function 'show_langwell_udc':
drivers/usb/gadget/langwell_udc.c:1693:3: error: implicit declaration of function 'lpm_device_speed'
drivers/usb/gadget/langwell_udc.c: At top level:
drivers/usb/gadget/langwell_udc.c:2637:37: error: conflicting types for 'lpm_device_speed'
drivers/usb/gadget/langwell_udc.c:1693:20: note: previous implicit declaration of 'lpm_device_speed' was here
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: linux-usb@vger.kernel.org
---
drivers/usb/gadget/langwell_udc.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
--- next-2011-1007.orig/drivers/usb/gadget/langwell_udc.c
+++ next-2011-1007/drivers/usb/gadget/langwell_udc.c
@@ -1562,6 +1562,20 @@ static ssize_t show_function(struct devi
static DEVICE_ATTR(function, S_IRUGO, show_function, NULL);
+static inline enum usb_device_speed lpm_device_speed(u32 reg)
+{
+ switch (LPM_PSPD(reg)) {
+ case LPM_SPEED_HIGH:
+ return USB_SPEED_HIGH;
+ case LPM_SPEED_FULL:
+ return USB_SPEED_FULL;
+ case LPM_SPEED_LOW:
+ return USB_SPEED_LOW;
+ default:
+ return USB_SPEED_UNKNOWN;
+ }
+}
+
/* device "langwell_udc" sysfs attribute file */
static ssize_t show_langwell_udc(struct device *_dev,
struct device_attribute *attr, char *buf)
@@ -2634,20 +2648,6 @@ done:
dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__);
}
-static inline enum usb_device_speed lpm_device_speed(u32 reg)
-{
- switch (LPM_PSPD(reg)) {
- case LPM_SPEED_HIGH:
- return USB_SPEED_HIGH;
- case LPM_SPEED_FULL:
- return USB_SPEED_FULL;
- case LPM_SPEED_LOW:
- return USB_SPEED_LOW;
- default:
- return USB_SPEED_UNKNOWN;
- }
-}
-
/* port change detect interrupt handler */
static void handle_port_change(struct langwell_udc *dev)
{
^ permalink raw reply
* RE: [PATCH -next] infiniband: fix ipath_chip_init.c build errors
From: Mike Marciniszyn @ 2011-10-10 18:57 UTC (permalink / raw)
To: Roland Dreier, Randy Dunlap
Cc: Stephen Rothwell, linux-next@vger.kernel.org, linux-kernel,
Dept_Infinipath, linux-rdma@vger.kernel.org, Andrew Morton
In-Reply-To: <CAL1RGDXoiRfR1Ku67tRgbhxzyWQmDrjKCztnVd6wbwi0Uud90Q@mail.gmail.com>
As do I.
I've confirmed that patch does no harm, but I would like to see the error.
Which of the github repos exposes the error?
Mike
> -----Original Message-----
> From: Roland Dreier [mailto:roland@purestorage.com]
> Sent: Friday, October 07, 2011 5:21 PM
> To: Randy Dunlap
> Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel;
> Dept_Infinipath; linux-rdma@vger.kernel.org; Andrew Morton
> Subject: Re: [PATCH -next] infiniband: fix ipath_chip_init.c build
> errors
>
> On Fri, Oct 7, 2011 at 1:59 PM, Randy Dunlap <rdunlap@xenotime.net>
> wrote:
> > Add <linux/stat.h> to fix build errors:
>
> When did this break? I build ipath in my test config all the time...
>
> - R.
This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.
^ permalink raw reply
* Re: [PATCH -next] infiniband: fix ipath_chip_init.c build errors
From: Randy Dunlap @ 2011-10-10 19:02 UTC (permalink / raw)
To: Mike Marciniszyn
Cc: Roland Dreier, Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel, Dept_Infinipath, linux-rdma@vger.kernel.org,
Andrew Morton
In-Reply-To: <35AAF1E4A771E142979F27B51793A48888433C0838@AVEXMB1.qlogic.org>
On 10/10/11 11:57, Mike Marciniszyn wrote:
> As do I.
>
> I've confirmed that patch does no harm, but I would like to see the error.
>
> Which of the github repos exposes the error?
I saw it in linux-next of 20111007.
> Mike
>
>> -----Original Message-----
>> From: Roland Dreier [mailto:roland@purestorage.com]
>> Sent: Friday, October 07, 2011 5:21 PM
>> To: Randy Dunlap
>> Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel;
>> Dept_Infinipath; linux-rdma@vger.kernel.org; Andrew Morton
>> Subject: Re: [PATCH -next] infiniband: fix ipath_chip_init.c build
>> errors
>>
>> On Fri, Oct 7, 2011 at 1:59 PM, Randy Dunlap <rdunlap@xenotime.net>
>> wrote:
>>> Add <linux/stat.h> to fix build errors:
>>
>> When did this break? I build ipath in my test config all the time...
>>
>> - R.
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH -next] infiniband: fix ipath_chip_init.c build errors
From: Roland Dreier @ 2011-10-10 19:02 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, Mike Marciniszyn, linux-rdma,
Andrew Morton
In-Reply-To: <4E8F77B8.3000805@xenotime.net>
On Fri, Oct 7, 2011 at 3:05 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> First I saw it was in today's linux-next (20111007).
Got it... a latent problem exposed by some include clean up, probably.
Applied, thanks.
^ permalink raw reply
* Re: [PATCH -next] infiniband: fix ipath_chip_init.c build errors
From: Stephen Rothwell @ 2011-10-11 0:33 UTC (permalink / raw)
To: Roland Dreier
Cc: Randy Dunlap, linux-next, LKML, Mike Marciniszyn, linux-rdma,
Andrew Morton
In-Reply-To: <CAL1RGDWXV2=cYTRAvKuZbquOPS7n-p3NJkYnrzyK_ZAbKsJy6A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
On Mon, 10 Oct 2011 12:02:29 -0700 Roland Dreier <roland@purestorage.com> wrote:
>
> On Fri, Oct 7, 2011 at 3:05 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > First I saw it was in today's linux-next (20111007).
>
> Got it... a latent problem exposed by some include clean up, probably.
Almost certainly the module.h split up.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the s5p tree with the arm tree
From: Stephen Rothwell @ 2011-10-11 2:07 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Arnd Bergmann, Russell King, Boojin Kim,
Vinod Koul, Abhilash Kesavan
[-- Attachment #1: Type: text/plain, Size: 1018 bytes --]
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-exynos4/Kconfig between commit 15e0d9e37c7f ("ARM: pm: let
platforms select cpu_suspend support") from the arm tree and commits
bf856fbb5e10 ("ARM: EXYNOS4: Use generic DMA PL330 driver"), 0da3beadcbed
("ARM: S5P: Make the common S5P PM code conditionally compile") and
e2e13621b267 ("ARM: S5P: Make the sleep code common for S5P series SoCs")
from the s5p tree.
I did the obvious fixup (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-exynos4/Kconfig
index a652735,dd660eb..0000000
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -11,8 -11,9 +11,10 @@@ if ARCH_EXYNOS
config CPU_EXYNOS4210
bool
- select S3C_PL330_DMA
+ select SAMSUNG_DMADEV
+ select S5P_PM if PM
+ select S5P_SLEEP if PM
+ select ARM_CPU_SUSPEND if PM
help
Enable EXYNOS4210 CPU support
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the hid tree with Linus' tree
From: Stephen Rothwell @ 2011-10-11 3:37 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, David Herrmann, Bastien Nocera,
Jason Gerecke, Dmitry Torokhov
[-- Attachment #1: Type: text/plain, Size: 2090 bytes --]
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-wacom.c between commit 3512069eefd3 ("Input: wacom - add
POINTER and DIRECT device properties") from Linus' tree and commit
3797ef6b6bc0 ("HID: wacom: Set input bits before registration") from the
hid tree.
I fixed it up (maybe - see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/hid/hid-wacom.c
index 72ca689,519f56c..0000000
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@@ -304,6 -304,46 +304,48 @@@ static int wacom_raw_event(struct hid_d
return 1;
}
+ static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,
+ struct hid_field *field, struct hid_usage *usage, unsigned long **bit,
+ int *max)
+ {
+ struct input_dev *input = hi->input;
+
++ __set_bit(INPUT_PROP_POINTER, input->propbit);
++
+ /* Basics */
+ input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);
+
+ __set_bit(REL_WHEEL, input->relbit);
+
+ __set_bit(BTN_TOOL_PEN, input->keybit);
+ __set_bit(BTN_TOUCH, input->keybit);
+ __set_bit(BTN_STYLUS, input->keybit);
+ __set_bit(BTN_STYLUS2, input->keybit);
+ __set_bit(BTN_LEFT, input->keybit);
+ __set_bit(BTN_RIGHT, input->keybit);
+ __set_bit(BTN_MIDDLE, input->keybit);
+
+ /* Pad */
+ input->evbit[0] |= BIT(EV_MSC);
+
+ __set_bit(MSC_SERIAL, input->mscbit);
+
+ __set_bit(BTN_0, input->keybit);
+ __set_bit(BTN_1, input->keybit);
+ __set_bit(BTN_TOOL_FINGER, input->keybit);
+
+ /* Distance, rubber and mouse */
+ __set_bit(BTN_TOOL_RUBBER, input->keybit);
+ __set_bit(BTN_TOOL_MOUSE, input->keybit);
+
+ input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);
+ input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);
+ input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);
+ input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
+
+ return 0;
+ }
+
static int wacom_probe(struct hid_device *hdev,
const struct hid_device_id *id)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the infiniband tree
From: Stephen Rothwell @ 2011-10-11 3:49 UTC (permalink / raw)
To: Roland Dreier, linux-rdma
Cc: linux-next, linux-kernel, Faisal Latif, Tatyana Nikolova
[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]
Hi all,
After merging the infiniband tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/infiniband/hw/nes/nes_mgt.c: In function 'get_fpdu_info':
drivers/infiniband/hw/nes/nes_mgt.c:328:3: error: 'NES_DBG_PAU' undeclared (first use in this function)
drivers/infiniband/hw/nes/nes_mgt.c:328:3: note: each undeclared identifier is reported only once for each function it appears in
drivers/infiniband/hw/nes/nes_mgt.c: In function 'nes_chg_qh_handler':
drivers/infiniband/hw/nes/nes_mgt.c:664:4: error: 'NES_DBG_PAU' undeclared (first use in this function)
drivers/infiniband/hw/nes/nes_mgt.c: In function 'nes_change_quad_hash':
drivers/infiniband/hw/nes/nes_mgt.c:728:3: error: 'NES_DBG_PAU' undeclared (first use in this function)
Caused by commit cf3fbdf123bf ("RDMA/nes: Support for Packed And
Unaligned fpdus"). Please build tes ...
I have used the version of the infiniband tree from next-20111007 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the sound tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 4:43 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Peter Ujfalusi, Liam Girdwood,
Misael Lopez Cruz, Mark Brown, Jarkko Nikula, Tony Lindgren,
Arnd Bergmann
[-- Attachment #1: Type: text/plain, Size: 3259 bytes --]
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
arch/arm/plat-omap/devices.c between commit 40246e0003f0 ("ARM: OMAP:
mcbsp: Move out omap_mcbsp_register_board_cfg from plat-omap/devices")
from the arm-soc tree and commit d231f5cbac9e ("OMAP: McPDM: Convert
McPDM device to omap_device") from the sound tree.
Just overlapping removals. I fixed it up (see below) and can carry the
fix as necessary.
Mark, Liam: That sound tree commit has a few Signed-off-by lines with no
email addresses.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-omap/devices.c
index acd132c,40eca9b..0000000
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@@ -24,44 -24,56 +24,11 @@@
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/mmc.h>
-#include <mach/gpio.h>
#include <plat/menelaus.h>
-#include <plat/mcbsp.h>
#include <plat/omap44xx.h>
- #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
- defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
-
- static struct resource mcpdm_resources[] = {
- {
- .name = "mcpdm_mem",
- .start = OMAP44XX_MCPDM_BASE,
- .end = OMAP44XX_MCPDM_BASE + SZ_4K,
- .flags = IORESOURCE_MEM,
- },
- {
- .name = "mcpdm_irq",
- .start = OMAP44XX_IRQ_MCPDM,
- .end = OMAP44XX_IRQ_MCPDM,
- .flags = IORESOURCE_IRQ,
- },
- };
-
- static struct platform_device omap_mcpdm_device = {
- .name = "omap-mcpdm",
- .id = -1,
- .num_resources = ARRAY_SIZE(mcpdm_resources),
- .resource = mcpdm_resources,
- };
-
- static void omap_init_mcpdm(void)
- {
- (void) platform_device_register(&omap_mcpdm_device);
- }
- #else
- static inline void omap_init_mcpdm(void) {}
- #endif
-
/*-------------------------------------------------------------------------*/
-#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
-
-static struct platform_device **omap_mcbsp_devices;
-
-void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
- struct omap_mcbsp_platform_data *config, int size)
-{
- int i;
-
- omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
- GFP_KERNEL);
- if (!omap_mcbsp_devices) {
- printk(KERN_ERR "Could not register McBSP devices\n");
- return;
- }
-
- for (i = 0; i < size; i++) {
- struct platform_device *new_mcbsp;
- int ret;
-
- new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
- if (!new_mcbsp)
- continue;
- platform_device_add_resources(new_mcbsp, &res[i * res_count],
- res_count);
- new_mcbsp->dev.platform_data = &config[i];
- ret = platform_device_add(new_mcbsp);
- if (ret) {
- platform_device_put(new_mcbsp);
- continue;
- }
- omap_mcbsp_devices[i] = new_mcbsp;
- }
-}
-
-#else
-void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
- struct omap_mcbsp_platform_data *config, int size)
-{ }
-#endif
-
-/*-------------------------------------------------------------------------*/
-
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the md tree
From: Stephen Rothwell @ 2011-10-11 5:29 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 5087 bytes --]
Hi Neil,
After merging the md tree, today's linux-next build (x86_64_allmodconfig)
failed like this:
drivers/md/dm-raid.c:597:25: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:614:24: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:614:40: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:654:23: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:654:41: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:692:34: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:692:50: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:812:27: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:812:43: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c: In function 'analyse_superblocks':
drivers/md/dm-raid.c:852:2: error: unknown type name 'mdk_rdev_t'
drivers/md/dm-raid.c:853:2: error: unknown type name 'mddev_t'
drivers/md/dm-raid.c:853:19: warning: initialization from incompatible pointer type [enabled by default]
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:857:12: error: request for member 'meta_bdev' in something not a structure or union
drivers/md/dm-raid.c:860:3: error: implicit declaration of function 'super_load' [-Werror=implicit-function-declaration]
drivers/md/dm-raid.c:882:2: error: implicit declaration of function 'super_validate' [-Werror=implicit-function-declaration]
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
drivers/md/dm-raid.c: In function 'raid_ctr':
drivers/md/dm-raid.c:965:22: error: 'super_sync' undeclared (first use in this function)
drivers/md/dm-raid.c:965:22: note: each undeclared identifier is reported only once for each function it appears in
drivers/md/dm-raid.c: In function 'raid_status':
drivers/md/dm-raid.c:1100:4: error: unknown type name 'raid5_conf_t'
drivers/md/dm-raid.c:1103:4: error: request for member 'max_nr_stripes' in something not a structure or union
drivers/md/dm-raid.c: In function 'raid_io_hints':
drivers/md/dm-raid.c:1149:2: error: unknown type name 'raid5_conf_t'
drivers/md/dm-raid.c:1152:46: error: request for member 'raid_disks' in something not a structure or union
drivers/md/dm-raid.c:1152:65: error: request for member 'max_degraded' in something not a structure or union
Caused by commits 4251a3bcf0e1 ("md: removing typedefs: mdk_rdev_t ->
struct md_rdev") and 724d5bc7708a ("md: remove typedefs: mddev_t ->
struct mddev").
Have you dropped better versions of these commits? Please build test.
I have used the version of the tree from next-20111006 since
next-20111007 had another build problem.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the mfd tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 5:41 UTC (permalink / raw)
To: Samuel Ortiz
Cc: linux-next, linux-kernel, "Philippe Rétornaz",
Sascha Hauer, Arnd Bergmann, Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 923 bytes --]
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
arch/arm/mach-imx/mach-mx31moboard.c between commit 40d97b89bd3c
("mx31moboard: Add poweroff support") from the arm-soc tree and commit
1ab50c862862 ("ARM: imx/mx31moboard: Add mc13783 power button support")
from the mfd tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-imx/mach-mx31moboard.c
index fff7791,f7e302d..0000000
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@@ -28,9 -28,7 +28,10 @@@
#include <linux/spi/spi.h>
#include <linux/types.h>
#include <linux/memblock.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/err.h>
+ #include <linux/input.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the md tree
From: NeilBrown @ 2011-10-11 5:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111011162948.c3ca0fc8726a7d7b80e39744@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 5426 bytes --]
On Tue, 11 Oct 2011 16:29:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Neil,
>
> After merging the md tree, today's linux-next build (x86_64_allmodconfig)
> failed like this:
>
> drivers/md/dm-raid.c:597:25: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:614:24: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:614:40: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:654:23: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:654:41: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:692:34: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:692:50: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:812:27: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:812:43: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c: In function 'analyse_superblocks':
> drivers/md/dm-raid.c:852:2: error: unknown type name 'mdk_rdev_t'
> drivers/md/dm-raid.c:853:2: error: unknown type name 'mddev_t'
> drivers/md/dm-raid.c:853:19: warning: initialization from incompatible pointer type [enabled by default]
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:856:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:857:12: error: request for member 'meta_bdev' in something not a structure or union
> drivers/md/dm-raid.c:860:3: error: implicit declaration of function 'super_load' [-Werror=implicit-function-declaration]
> drivers/md/dm-raid.c:882:2: error: implicit declaration of function 'super_validate' [-Werror=implicit-function-declaration]
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: warning: left-hand operand of comma expression has no effect [-Wunused-value]
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'disks' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c:885:2: error: request for member 'same_set' in something not a structure or union
> drivers/md/dm-raid.c: In function 'raid_ctr':
> drivers/md/dm-raid.c:965:22: error: 'super_sync' undeclared (first use in this function)
> drivers/md/dm-raid.c:965:22: note: each undeclared identifier is reported only once for each function it appears in
> drivers/md/dm-raid.c: In function 'raid_status':
> drivers/md/dm-raid.c:1100:4: error: unknown type name 'raid5_conf_t'
> drivers/md/dm-raid.c:1103:4: error: request for member 'max_nr_stripes' in something not a structure or union
> drivers/md/dm-raid.c: In function 'raid_io_hints':
> drivers/md/dm-raid.c:1149:2: error: unknown type name 'raid5_conf_t'
> drivers/md/dm-raid.c:1152:46: error: request for member 'raid_disks' in something not a structure or union
> drivers/md/dm-raid.c:1152:65: error: request for member 'max_degraded' in something not a structure or union
>
> Caused by commits 4251a3bcf0e1 ("md: removing typedefs: mdk_rdev_t ->
> struct md_rdev") and 724d5bc7708a ("md: remove typedefs: mddev_t ->
> struct mddev").
>
> Have you dropped better versions of these commits? Please build test.
I'll add dm-raid back in to my build testing - I don't know why it dropped
out.
This will be fixed for tomorrow.
I might add the merge with the block layer too.
Thanks,
NeilBrown
>
> I have used the version of the tree from next-20111006 since
> next-20111007 had another build problem.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* linux-next: manual merge of the omap_dss2 tree with the arm-soc tree
From: Stephen Rothwell @ 2011-10-11 5:50 UTC (permalink / raw)
To: Tomi Valkeinen; +Cc: linux-next, linux-kernel, Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 2100 bytes --]
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
arch/arm/mach-omap2/board-h4.c between commit be7324605873 ("ARM: OMAP2+:
Remove custom init_irq for remaining boards") from the arm-soc tree and
commit cbf1455bfc9f ("OMAP: H4: Port the display driver to new DSS2")
from the omap_dss2 tree.
Just context changes If fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-h4.c
index a65effe,f7c09de..0000000
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -285,10 -301,17 +300,6 @@@ static struct omap_usb_config h4_usb_co
.hmc_mode = 0x00, /* 0:dev|otg 1:disable 2:disable */
};
- static struct omap_board_config_kernel h4_config[] __initdata = {
- { OMAP_TAG_LCD, &h4_lcd_config },
- };
-
-static void __init omap_h4_init_early(void)
-{
- omap2_init_common_infrastructure();
- omap2_init_common_devices(NULL, NULL);
-}
-
-static void __init omap_h4_init_irq(void)
-{
- omap2_init_irq();
-}
-
static struct at24_platform_data m24c01 = {
.byte_len = SZ_1K / 8,
.page_size = 16,
@@@ -359,17 -379,24 +367,19 @@@ static void __init omap_h4_init(void
platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices));
omap2_usbfs_init(&h4_usb_config);
omap_serial_init();
+ omap_sdrc_init(NULL, NULL);
h4_init_flash();
+
+ omap_display_init(&h4_dss_data);
}
-static void __init omap_h4_map_io(void)
-{
- omap2_set_globals_242x();
- omap242x_map_common_io();
-}
-
MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
- .boot_params = 0x80000100,
+ .atag_offset = 0x100,
.reserve = omap_reserve,
- .map_io = omap_h4_map_io,
- .init_early = omap_h4_init_early,
- .init_irq = omap_h4_init_irq,
+ .map_io = omap242x_map_io,
+ .init_early = omap2420_init_early,
+ .init_irq = omap2_init_irq,
.init_machine = omap_h4_init,
.timer = &omap2_timer,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the sound tree with the arm-soc tree
From: Ujfalusi, Peter @ 2011-10-11 6:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Takashi Iwai, linux-next, linux-kernel, Liam Girdwood,
Misael Lopez Cruz, Mark Brown, Jarkko Nikula, Tony Lindgren,
Arnd Bergmann
In-Reply-To: <20111011154304.f7fefc4f7f86b4b10348578c@canb.auug.org.au>
Hi Stephen,
On Tue, Oct 11, 2011 at 7:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Takashi,
>
> Today's linux-next merge of the sound tree got a conflict in
> arch/arm/plat-omap/devices.c between commit 40246e0003f0 ("ARM: OMAP:
> mcbsp: Move out omap_mcbsp_register_board_cfg from plat-omap/devices")
> from the arm-soc tree and commit d231f5cbac9e ("OMAP: McPDM: Convert
> McPDM device to omap_device") from the sound tree.
>
> Just overlapping removals. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks, the McBSP change came via linux-omap while we had the McPDM
changes coming via sound tree.
>
> Mark, Liam: That sound tree commit has a few Signed-off-by lines with no
> email addresses.
I can not track their new contact information. They used to work for TI, and I
have been advised to give them credit for their work on this area.
I could have added no longer valid email addresses...
--
Péter
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/plat-omap/devices.c
> index acd132c,40eca9b..0000000
> --- a/arch/arm/plat-omap/devices.c
> +++ b/arch/arm/plat-omap/devices.c
> @@@ -24,44 -24,56 +24,11 @@@
> #include <plat/tc.h>
> #include <plat/board.h>
> #include <plat/mmc.h>
> -#include <mach/gpio.h>
> #include <plat/menelaus.h>
> -#include <plat/mcbsp.h>
> #include <plat/omap44xx.h>
>
> - #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
> - defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
> -
> - static struct resource mcpdm_resources[] = {
> - {
> - .name = "mcpdm_mem",
> - .start = OMAP44XX_MCPDM_BASE,
> - .end = OMAP44XX_MCPDM_BASE + SZ_4K,
> - .flags = IORESOURCE_MEM,
> - },
> - {
> - .name = "mcpdm_irq",
> - .start = OMAP44XX_IRQ_MCPDM,
> - .end = OMAP44XX_IRQ_MCPDM,
> - .flags = IORESOURCE_IRQ,
> - },
> - };
> -
> - static struct platform_device omap_mcpdm_device = {
> - .name = "omap-mcpdm",
> - .id = -1,
> - .num_resources = ARRAY_SIZE(mcpdm_resources),
> - .resource = mcpdm_resources,
> - };
> -
> - static void omap_init_mcpdm(void)
> - {
> - (void) platform_device_register(&omap_mcpdm_device);
> - }
> - #else
> - static inline void omap_init_mcpdm(void) {}
> - #endif
> -
> /*-------------------------------------------------------------------------*/
>
> -#if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
> -
> -static struct platform_device **omap_mcbsp_devices;
> -
> -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
> - struct omap_mcbsp_platform_data *config, int size)
> -{
> - int i;
> -
> - omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
> - GFP_KERNEL);
> - if (!omap_mcbsp_devices) {
> - printk(KERN_ERR "Could not register McBSP devices\n");
> - return;
> - }
> -
> - for (i = 0; i < size; i++) {
> - struct platform_device *new_mcbsp;
> - int ret;
> -
> - new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
> - if (!new_mcbsp)
> - continue;
> - platform_device_add_resources(new_mcbsp, &res[i * res_count],
> - res_count);
> - new_mcbsp->dev.platform_data = &config[i];
> - ret = platform_device_add(new_mcbsp);
> - if (ret) {
> - platform_device_put(new_mcbsp);
> - continue;
> - }
> - omap_mcbsp_devices[i] = new_mcbsp;
> - }
> -}
> -
> -#else
> -void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
> - struct omap_mcbsp_platform_data *config, int size)
> -{ }
> -#endif
> -
> -/*-------------------------------------------------------------------------*/
> -
> #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
> defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
>
>
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2011-10-11 6:15 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next,
linux-kernel, Huang Ying, David Miller, netdev
In-Reply-To: <1317804373.6766.0.camel@twins>
[-- Attachment #1: Type: text/plain, Size: 1495 bytes --]
Hi all,
On Wed, 05 Oct 2011 10:46:13 +0200 Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Wed, 2011-10-05 at 17:25 +1100, Stephen Rothwell wrote:
> >
> > After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > net/rds/ib_rdma.c: In function 'rds_ib_reuse_fmr':
> > net/rds/ib_rdma.c:272:2: error: implicit declaration of function 'llist_del_first' [-Werror=implicit-function-declaration]
> > net/rds/ib_rdma.c:272:6: warning: assignment makes pointer from integer without a cast [enabled by default]
> > net/rds/ib_rdma.c: In function 'rds_ib_flush_mr_pool':
> > net/rds/ib_rdma.c:671:4: error: implicit declaration of function 'llist_add_batch' [-Werror=implicit-function-declaration]
> > cc1: some warnings being treated as errors
> >
> > Caused by commit 1230db8e1543 ("llist: Make some llist functions inline")
> > interacting with commit 1bc144b62524 ("net, rds, Replace xlist in
> > net/rds/xlist.h with llist") from the net tree. The former commit
> > removes the declarations of llist_del_first() and llist_add_batch() with
> > no explanation (and probably by accident since the definitions still
> > exist).
>
> Ugh yes, my bad. Ingo objected to inlining all those functions and I
> then screwed up. There are no users of those two functions in my tree.
So can we have that fixed, please?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Stephen Rothwell @ 2011-10-11 6:37 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Tomoya MORINAGA
In-Reply-To: <20111006144826.a69a5ea59d4ca94f8f7414cf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 872 bytes --]
Hi Grant,
On Thu, 6 Oct 2011 14:48:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the gpio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
>
> Presumably caused by commits 54be566317b6 ("gpio-ml-ioh: Support
> interrupt function") and 38eb18a6f92d ("gpio-pch: Support interrupt
> function").
>
> I have used the gpio tree from next-20111005 for today.
I am still getting this build failure.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Tomoya MORINAGA @ 2011-10-11 7:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Grant Likely, linux-next, linux-kernel, Tomoya MORINAGA
In-Reply-To: <20111011173714.d54bbcee6c0676ddcc37a1f3@canb.auug.org.au>
(2011/10/11 15:37), Stephen Rothwell wrote:
> Hi Grant,
>
> On Thu, 6 Oct 2011 14:48:26 +1100 Stephen Rothwell<sfr@canb.auug.org.au> wrote:
>>
>> After merging the gpio tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
>> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-pch.ko] undefined!
>> ERROR: "irq_setup_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
>> ERROR: "irq_alloc_generic_chip" [drivers/gpio/gpio-ml-ioh.ko] undefined!
>>
>> Presumably caused by commits 54be566317b6 ("gpio-ml-ioh: Support
>> interrupt function") and 38eb18a6f92d ("gpio-pch: Support interrupt
>> function").
>>
>> I have used the gpio tree from next-20111005 for today.
>
> I am still getting this build failure.
>
I built this driver with success using linux-3.0.
I want to try to build with the same as your build environment.
Where can I get your environment ?
Thanks,
--
tomoya
ROHM Co., Ltd.
^ 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