* Re: linux-next: build failure after merge of the final tree (Linus' tree related)
From: David Miller @ 2012-03-30 5:45 UTC (permalink / raw)
To: sfr; +Cc: dhowells, linux-next, linux-kernel, torvalds
In-Reply-To: <20120329.233937.885408108371285308.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Thu, 29 Mar 2012 23:39:37 -0400 (EDT)
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Fri, 30 Mar 2012 14:26:24 +1100
>> Subject: [PATCH] sparc: fix fallout from system.h split
>>
>> Fixes this build error:
>>
>> kernel/signal.c: In function 'ptrace_stop':
>> kernel/signal.c:1860:3: error: implicit declaration of function 'synchronize_user_stack' [-Werror=implicit-function-declaration]
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Unfortunately there's more changes needed to fix the allmodconfig
build on sparc64 completely, I'll push it all to Linus.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (Linus' tree related)
From: Stephen Rothwell @ 2012-03-30 6:31 UTC (permalink / raw)
To: David Miller; +Cc: dhowells, linux-next, linux-kernel, torvalds
In-Reply-To: <20120330.014500.609615234139434409.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 864 bytes --]
Hi Dave,
On Fri, 30 Mar 2012 01:45:00 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: David Miller <davem@davemloft.net>
> Date: Thu, 29 Mar 2012 23:39:37 -0400 (EDT)
>
> >> From: Stephen Rothwell <sfr@canb.auug.org.au>
> >> Date: Fri, 30 Mar 2012 14:26:24 +1100
> >> Subject: [PATCH] sparc: fix fallout from system.h split
> >>
> >> Fixes this build error:
> >>
> >> kernel/signal.c: In function 'ptrace_stop':
> >> kernel/signal.c:1860:3: error: implicit declaration of function 'synchronize_user_stack' [-Werror=implicit-function-declaration]
> >>
> >> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> Unfortunately there's more changes needed to fix the allmodconfig
> build on sparc64 completely, I'll push it all to Linus.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the hid tree
From: Jiri Kosina @ 2012-03-30 8:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jiri Kosina, linux-next, linux-kernel, Przemo Firszt
In-Reply-To: <20120329115117.70e8660dbd0c73354486eba9@canb.auug.org.au>
On Thu, 29 Mar 2012, Stephen Rothwell wrote:
> After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> drivers/hid/Kconfig:595:error: recursive dependency detected!
> drivers/hid/Kconfig:595: symbol HID_WACOM depends on HID_WACOM
>
> Caused (very obviously) by commit 224b321b312e ("HID: wacom: Remove
> CONFIG_HID_WACOM_POWER_SUPPLY option").
Yeah, it has been already fixed in my tree a few hours after the first
commit, but I raced with you snapshotting the tree. It should be gone now.
> Please test this stuff. And don't rush stuff in during the merge window ...
Hm, I accidentally pushed it out to for-next, even though it's not
destined for current merge window. Will flush the for-next branch now,
sorry for that. I don't have anything pending for this merge window at the
moment, so the for-next queue definitely should be empty.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* Re: [PATCH] ARM: pxa: fix build failure for regulator consumer in em-x270.c
From: Igor Grinberg @ 2012-03-30 11:25 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Mark Brown, haojian.zhuang, linux-arm-kernel, linux-next
In-Reply-To: <4F7477CB.5070206@windriver.com>
On 03/29/12 16:55, Paul Gortmaker wrote:
> On 12-03-29 10:28 AM, Igor Grinberg wrote:
>> On 03/28/12 18:59, Paul Gortmaker wrote:
>>> On 12-03-28 12:13 PM, Mark Brown wrote:
>>>> On Wed, Mar 28, 2012 at 11:59:41AM -0400, Paul Gortmaker wrote:
>>>>> On 12-03-28 11:27 AM, Mark Brown wrote:
>>>>
>>>>> static struct platform_device em_x270_gps_userspace_consumer = {
>>>>> .name = "reg-userspace-consumer",
>>>>> .id = 0,
>>>>
>>>>> static struct platform_device em_x270_gprs_userspace_consumer = {
>>>>> .name = "reg-userspace-consumer",
>>>>> .id = 1,
>>>>
>>>>> Note that the existing names currently don't incorporate the .id
>>>>> field as a suffix, and so never were unique.
>>>>
>>>> No, this is just a basic part of how platform devices work - the device
>>>> name is always the same and if you've got more than one of them they get
>>>> different .ids. dev_name() returns name.id, or just name if id is set
>>>> to -1 indicating that there's onyl one device of a given type.
>>>
>>> OK, so Igor - can you simply retest the v2 patch, but make the
>>> two trivial changes:
>>>
>>> -REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer", "vcc gps");
>>> +REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
>>>
>>> -REGULATOR_CONSUMER(ldo19, "reg-userspace-consumer", "vcc gprs");
>>> +REGULATOR_CONSUMER(ldo19, "reg-userspace-consumer.1", "vcc gprs");
>>
>> Well, I thought of this solution, but I don't like it, as it makes
>> the whole thing very fragile and sensitive to the reg-userspace-consumer
>> platform device registration order and count, isn't it?
>
> Why would it be order dependent? You can see in the above structs
> that they explicitly call out an ID value -- it is _not_ chosen at
> the time of registration. So it will always be:
>
> reg-userspace-consumer.0 --> gps consumer
> reg-userspace-consumer.1 --> gprs consumer
>
> At least that is my (limited) understanding, based on what
> Mark was saying.
The problem is, that someone has to stop sending emails in a hurry...
Spitting all the mix in the head when in rush...
and that would be me...
Sorry, for the mess, I'll try to fix myself up...
--
Regards,
Igor.
^ permalink raw reply
* Re: [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback
From: Catalin Marinas @ 2012-03-30 13:52 UTC (permalink / raw)
To: Ingo Molnar
Cc: Russell King, Linus Torvalds, Stephen Rothwell,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra
In-Reply-To: <20120313154716.GA31293@elte.hu>
Hi Ingo,
On Tue, Mar 13, 2012 at 03:47:16PM +0000, Ingo Molnar wrote:
> Anyway - regardless of any differences and flames about workflow
> details, both you and Catalin should still feel free to use both
> the original commit (1cf00341547a) or the tip:sched/arch branch
> I provided (01f23e1630d9).
About the scheduler hook patch, would it go into mainline via the
sched/urgent or the sched/arch branch? I would like to rebase the
ARM-specific patches on top of one of these branches and send you a pull
request (with Russell's ack).
Alternatively, I can wait until some 3.4-rc (and merge the ARM patches
via Russell).
Thanks.
--
Catalin
^ permalink raw reply
* Re: [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback
From: Ingo Molnar @ 2012-03-30 14:25 UTC (permalink / raw)
To: Catalin Marinas
Cc: Ingo Molnar, Russell King, Linus Torvalds, Stephen Rothwell,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra
In-Reply-To: <20120330135255.GC23295@arm.com>
* Catalin Marinas <catalin.marinas@arm.com> wrote:
> Hi Ingo,
>
> On Tue, Mar 13, 2012 at 03:47:16PM +0000, Ingo Molnar wrote:
> > Anyway - regardless of any differences and flames about workflow
> > details, both you and Catalin should still feel free to use both
> > the original commit (1cf00341547a) or the tip:sched/arch branch
> > I provided (01f23e1630d9).
>
> About the scheduler hook patch, would it go into mainline via
> the sched/urgent or the sched/arch branch? I would like to
> rebase the ARM-specific patches on top of one of these
> branches and send you a pull request (with Russell's ack).
I've merged it into sched/urgent yesterday, which I'll send to
Linus - so you can base it on that.
Thanks,
Ingo
^ permalink raw reply
* Re: [GIT PULL/NEXT] sched/arch: Introduce the finish_arch_post_lock_switch() scheduler callback
From: Catalin Marinas @ 2012-03-30 17:21 UTC (permalink / raw)
To: Ingo Molnar
Cc: Ingo Molnar, Russell King, Linus Torvalds, Stephen Rothwell,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Zijlstra
In-Reply-To: <20120330142544.GA13966@gmail.com>
On Fri, Mar 30, 2012 at 03:25:44PM +0100, Ingo Molnar wrote:
>
> * Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> > Hi Ingo,
> >
> > On Tue, Mar 13, 2012 at 03:47:16PM +0000, Ingo Molnar wrote:
> > > Anyway - regardless of any differences and flames about workflow
> > > details, both you and Catalin should still feel free to use both
> > > the original commit (1cf00341547a) or the tip:sched/arch branch
> > > I provided (01f23e1630d9).
> >
> > About the scheduler hook patch, would it go into mainline via
> > the sched/urgent or the sched/arch branch? I would like to
> > rebase the ARM-specific patches on top of one of these
> > branches and send you a pull request (with Russell's ack).
>
> I've merged it into sched/urgent yesterday, which I'll send to
> Linus - so you can base it on that.
Thanks.
Russell, are you happy for me to add your acked-by to the ARM patches?
--
Catalin
^ permalink raw reply
* [PATCH -next] staging: fix android persistent_ram printk formats
From: Randy Dunlap @ 2012-03-30 17:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Brian Swetland, Greg Kroah-Hartman, devel
In-Reply-To: <20120330144443.4f9c6fdbd7f877e00b79b6da@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix printk format warnings in android/persistent_ram.c:
drivers/staging/android/persistent_ram.c:426:4: warning: format '%ld' expects type 'long int', but argument 2 has type 'size_t'
drivers/staging/android/persistent_ram.c:426:4: warning: format '%ld' expects type 'long int', but argument 3 has type 'size_t'
drivers/staging/android/persistent_ram.c:430:4: warning: format '%ld' expects type 'long int', but argument 2 has type 'size_t'
drivers/staging/android/persistent_ram.c:430:4: warning: format '%ld' expects type 'long int', but argument 3 has type 'size_t'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Brian Swetland <swetland@google.com>
---
drivers/staging/android/persistent_ram.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20120330.orig/drivers/staging/android/persistent_ram.c
+++ linux-next-20120330/drivers/staging/android/persistent_ram.c
@@ -424,11 +424,11 @@ struct persistent_ram_zone *__persistent
if (buffer_size(prz) > prz->buffer_size ||
buffer_start(prz) > buffer_size(prz))
pr_info("persistent_ram: found existing invalid buffer,"
- " size %ld, start %ld\n",
+ " size %zu, start %zu\n",
buffer_size(prz), buffer_start(prz));
else {
pr_info("persistent_ram: found existing buffer,"
- " size %ld, start %ld\n",
+ " size %zu, start %zu\n",
buffer_size(prz), buffer_start(prz));
persistent_ram_save_old(prz);
}
^ permalink raw reply
* linux-next: triage for March 31, 2012
From: Paul Gortmaker @ 2012-04-01 1:29 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel, dhowells, torvalds
This represents the state of the builds as of Friday, since there
are no weekend linux-next builds. This is still the 3.4 content.
Lots of breakage to report. Most of it appears to be caused by
the asm/system.h split up going directly into Linus' tree without
any soak in linux-next. Lets hope we can avoid this in the future.
I'm not going to list all the fails individually because there are
simply too many. I'll try and do an arch overview and capture
what has been fixed already and what may remain as unfixed.
Note that "fixed" does not imply it made it into 3.4-rc1; I've
not yet checked what made it there. But since we now have 3.4-rc1
I'm assuming that linux-next will move onto the 3.5 content, and
so we'll be largely changing context with these triage reports,
and this will represent the last 3.4 based status report.
Of course if breakage is due to mainline commits, please work
to get those in the pending 3.4-rcN (N>1) releases. I think
the system.h fallout definitely falls into this category.
That said, the asm/system.h breakage that _should_ be fixed:
ARM: ~10 fails. Olof has run all the defconfigs, and I think fixed them all
http://lists.arm.linux.org.uk/lurker/message/20120330.143801.0025ae2c.en.html
http://lists.arm.linux.org.uk/lurker/message/20120330.232025.982eba3a.en.html
SPARC: SamR/DaveM have already got the fixes to Linus
http://marc.info/?l=linux-sparc&m=133315678827041&w=2
S390: Should be fixed by Heiko
http://marc.info/?l=linux-s390&m=133311833911171&w=2
The asm/system.h breakage that is possibly not fixed:
alpha: include/linux/llist.h: asm/cmpxchg.h: No such file or directory
http://kisskb.ellerman.id.au/kisskb/buildresult/6000253/
or32: include/asm-generic/cmpxchg.h: error: expected ')' before 'u8'
http://kisskb.ellerman.id.au/kisskb/buildresult/6000411/
parisc: include/linux/llist.h: fatal: asm/cmpxchg.h: No such file or directory
http://kisskb.ellerman.id.au/kisskb/buildresult/6000168/
tilegx: include/linux/llist.h: fatal: asm/cmpxchg.h: No such file or directory
http://kisskb.ellerman.id.au/kisskb/buildresult/6000412/
bfin: include/asm-generic/cmpxchg.h: error: redefinition of '__xchg'
http://kisskb.ellerman.id.au/kisskb/buildresult/6000322/
sh4: drivers/char/tpm/tpm.h: implicit declaration of function 'outb'
http://kisskb.ellerman.id.au/kisskb/buildresult/6000156/
sh4: arch/sh/kernel/cpu/shmobile/pm.c: implicit declaration of 'set_bl_bit'
http://kisskb.ellerman.id.au/kisskb/buildresult/6000181/
sh4: arch/sh/mm/flush-sh4.c implicit declaration of 'register_align'
http://kisskb.ellerman.id.au/kisskb/buildresult/6000183/
MIPS: system.h breakup wasn't tested on master with bug.h change.
http://kisskb.ellerman.id.au/kisskb/buildresult/6000165/
==============================================
New breakage since last report:
See above system.h chaos.
Randconfig fails that may or may not be new (by their very nature):
powerpc: mpc512x_shared.c: parameter 1 ('port') has incomplete type
http://kisskb.ellerman.id.au/kisskb/buildresult/6000263/
Builds that are fixed since last report:
sh4: several configs that were failing on the fls thing that
originated with DavidH's 1st commit are now passing, but the
majority of sh4 still fail with the new issues listed above.
bfin: all builds with the "L1 data A overflow" issue are fixed,
but conveniently they were also broken via __xchg issue above.
The following have fixes posted for quite some time now, but the fixes
haven't yet been integrated. Please have a look at these, as it would
be nice to have them in tree for rc2 as build regression fixes.
ARM:magician_defconfig
ARM:collie_defconfig
ARM:iop32x_defconfig,iop33x_defconfig
ARM:em_x270_defconfig
AVR32:defconfig
Note: The randconfig fails are only listed once and not tracked
in the below listing.
------------------------------------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of March 31st, 2012:
================================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:collie_defconfig
when: Feb 14
why: locomolcd.c: error: 'sa1100fb_lcd_power' undeclared
status: fixed (PaulG) - pending integration
fix: http://marc.info/?l=linux-next&m=133105157730749&w=2
ref:
ARM:iop32x_defconfig,iop33x_defconfig
when: Nov 23
why: restart.c: implicit declaration of function 'soft_restart'
status: fixed (PaulG) - pending integration
fix: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081461.html
fix: https://lkml.org/lkml/2012/3/14/253
ref:
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:magician_defconfig
when: Feb 13
why: magician.c: unknown field 'dev' specified in initializer
status: fixed (PaulG) - pending integration
fix: http://marc.info/?l=linux-arm-kernel&m=133124258707457&w=2
ref: http://marc.info/?l=linux-next&m=133106325903524&w=2
ARM:em_x270_defconfig
when: Feb 14
why: em-x270.c: unknown field 'dev' specified in initializer
status: fixed (PaulG) - pending integration
fix: http://www.spinics.net/lists/arm-kernel/msg164012.html
ref: http://www.spinics.net/lists/arm-kernel/msg163135.html
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
ARM:arm-allnoconfig
when: forever
why: not supported
status: nothing pending, but patches accepted
fix: n/a
ref: https://lkml.org/lkml/2009/4/30/105
ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
----------------
AVR32:defconfig
when: Mar 18
why: board.h: atmel_nand.h: No such file or directory
status: reported/fixed (PaulG)
fix: http://marc.info/?l=linux-arm-kernel&m=133239363802517&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5917107/
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin:***all-builds***
when: Mar 26
why: bfin-uclinux-ld: L1 data A overflow!
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5981475/
---------------
cris:***all-builds***
when: Mar 25, 22:05
why: include/linux/types.h:25: error expected ... before 'ino_t'
status:
fix:
ref:
----------------
crisv32:***all-builds***
when: Mar 25, 22:05
why: include/linux/types.h:25: error expected ... before 'ino_t'
status:
fix:
ref:
----------------
frv:defconfig
when: Mar 15
why: arch/frv/kernel/head.S operand out of range
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884666/
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
i386:allmodconfig
when: Mar 8, 20:41
why: ERROR: "mdfld_set_brightness" [drivers/gpu/drm/gma500/gma500_gfx.ko] undefined!
status:
fix:
ref: https://lkml.org/lkml/2012/3/24/122
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878506/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
m68k:sun3_defconfig,m68k_defconfig
when: Mar 26
why: sun3_NCR5380.c: static decl of 'sun3scsi_proc_info' follows non-static
status:
fix:
ref: http://marc.info/?l=linux-next&m=133279244817422&w=2
m68k:allmodconfig
when: Mar 16
why: persistent_ram.c: implicit declaration of 'memblock_reserve'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
ref: http://www.spinics.net/lists/linux-next/msg19343.html
----------------
mips:allmodconfig
when:
why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
status: one of many fixes mips needs...
fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
ref: http://patchwork.ozlabs.org/patch/148614/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
----------------
parisc:allmodconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:allyesconfig
when: May 18 2009, 22:11
why: fat ass kernel with everything simply won't link
status: need to fix build config to ignore the final link
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
------------------
sh4:***all-builds***
when: Feb 24, 17:38
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
um:um-defconfig
when: Sep 16 2010, 01:28
why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
status: clearly broken forever, so does anyone care?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
^ permalink raw reply
* linux-next stats (Was: Linux 3.4-rc1)
From: Stephen Rothwell @ 2012-04-01 13:14 UTC (permalink / raw)
To: linux-next; +Cc: Linux Kernel Mailing List, Linus Torvalds, Andrew Morton
In-Reply-To: <CA+55aFy4aFGRLUrF+rYN3dskTepBtC+=x3B3bc_rzf1OaN_5pw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
All these stats are relative to next-20120319 (the last before v3.3).
Also merge commits are excluded.
Commits in next-20120319 (relative to v3.3): 9444
Commits in v3.4-rc1 (relative to v3.3): 9248
Commits in v3.4-rc1 common with next-20120319: 6847 74.03%
Further commits with the same patch_id: 935 10.11% (1)
Further commits with the same subject: 63 0.68% (2)
Total (close to) common patches: 7845 84.82%
Non common patches: 1403 15.17%
(1) would include quilt trees and rebased git trees.
(2) would include some patches that have been fixed up (in Andrew's case
some of these fixes have been in linux-next as follow up patches).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH 00/11] Fix up more asm/system.h fallout
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker
Like others, I was surprised it didn't get a soak in linux-next
before being merged, but I guess what is done is done, so lets
try and limit the fallout from having any wider of a commit range
than it already does.
It is all system.h stuff except for three things.
1) an avr32 patch I'd created but the avr32 guys hadn't got
signed keys yet, so I might as well get it in here along
with other similar build fail fixes (the atmel one).
2) A cosmetic fix to the device.h changeset from me earlier.
3) A trivial warning fix to an arch/frv specific file.
I'm going to queue this up in my feed branch to linux-next
so we can start reducing the number of build failures from what
we had on Friday.
Paul.
---
The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:
Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux.git buildfixes
for you to fetch changes up to af901116760f93297ad53cc3a0cc5e370e9ccb5a:
asm-generic: add linux/types.h to cmpxchg.h (2012-04-01 15:59:54 -0400)
----------------------------------------------------------------
Paul Gortmaker (11):
irq_work: fix compile failure on MIPS from system.h split
ARM: mach-msm: fix compile fail from system.h fallout
avr32: fix nop compile fails from system.h split up
avr32: fix build failures from mis-naming of atmel_nand.h
blackfin: fix cmpxchg build fails from system.h fallout
parisc: fix missing cmpxchg file error from system.h split
sh: fix several build failures from system.h fallout
frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL
firewire: restore the device.h include in linux/firewire.h
tile: fix multiple build failures from system.h dismantle
asm-generic: add linux/types.h to cmpxchg.h
arch/arm/mach-msm/include/mach/uncompress.h | 1 +
arch/avr32/include/asm/mmu_context.h | 1 +
arch/avr32/mach-at32ap/include/mach/board.h | 2 +-
arch/blackfin/include/asm/cmpxchg.h | 3 +-
arch/frv/mb93090-mb00/pci-dma.c | 1 +
arch/parisc/include/asm/atomic.h | 107 +------------------------
arch/parisc/include/asm/cmpxchg.h | 116 +++++++++++++++++++++++++++
arch/sh/kernel/cpu/fpu.c | 1 +
arch/sh/kernel/cpu/sh4/fpu.c | 1 +
arch/sh/mm/cache-sh4.c | 1 +
arch/sh/mm/flush-sh4.c | 1 +
arch/tile/include/asm/atomic.h | 50 +-----------
arch/tile/include/asm/cmpxchg.h | 73 +++++++++++++++++
arch/tile/kernel/process.c | 1 +
arch/tile/kernel/stack.c | 1 +
include/asm-generic/cmpxchg.h | 1 +
include/linux/firewire.h | 3 +-
include/linux/platform_data/atmel.h | 6 +-
kernel/irq_work.c | 1 +
19 files changed, 210 insertions(+), 161 deletions(-)
create mode 100644 arch/parisc/include/asm/cmpxchg.h
create mode 100644 arch/tile/include/asm/cmpxchg.h
--
1.7.9.1
^ permalink raw reply
* [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Builds of the MIPS platform ip32_defconfig fails as of
commit 0195c00244dc2e9f522475868fa278c473ba7339
"Merge tag 'split-asm_system_h-for-linus-20120328' ..."
because MIPS xchg() macro uses BUILD_BUG_ON and it was moved
in commit b81947c646bfefdf98e2fde5d7d39cbbda8525d4
"Disintegrate asm/system.h for MIPS"
The root cause is that the system.h split wasn't tested on
a baseline with commit 6c03438edeb5c359af35f060ea016ca65671c269
"kernel.h: doesn't explicitly use bug.h, so don't include it."
Since this file uses BUG code in several other places besides
the xchg call, simply make the inclusion explicit.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
kernel/irq_work.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index c3c46c7..0c56d44 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -5,6 +5,7 @@
* context. The enqueueing is NMI-safe.
*/
+#include <linux/bug.h>
#include <linux/kernel.h>
#include <linux/export.h>
#include <linux/irq_work.h>
--
1.7.9.1
^ permalink raw reply related
* [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
To fix:
In file included from arm/boot/compressed/misc.c:28:0:
arm/mach-msm/include/mach/uncompress.h: In function 'putc':
arch/arm/mach-msm/include/mach/uncompress.h:48:3: error: implicit
declaration of function 'smp_mb' [-Werror=implicit-function-declaration]
The putc does a cpu_relax which for this platform is smp_mb.
Bisect indicates the 1st failing commit as:
commit 0195c00244dc2e9f522475868fa278c473ba7339
"Merge tag 'split-asm_system_h-for-linus-20120328' ..."
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/arm/mach-msm/include/mach/uncompress.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-msm/include/mach/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h
index 169a840..c14011f 100644
--- a/arch/arm/mach-msm/include/mach/uncompress.h
+++ b/arch/arm/mach-msm/include/mach/uncompress.h
@@ -16,6 +16,7 @@
#ifndef __ASM_ARCH_MSM_UNCOMPRESS_H
#define __ASM_ARCH_MSM_UNCOMPRESS_H
+#include <asm/barrier.h>
#include <asm/processor.h>
#include <mach/msm_iomap.h>
--
1.7.9.1
^ permalink raw reply related
* [PATCH 04/11] avr32: fix build failures from mis-naming of atmel_nand.h
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells
Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker,
Jean-Christophe PLAGNIOL-VILLARD, David Woodhouse
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Commit bf4289cba02b8cf770ecd7959ca70839f0dd9d3c
"ATMEL: fix nand ecc support"
indicated that it wanted to "Move platform data to a common
header include/linux/platform_data/atmel_nand.h" and the new
header even had re-include protectors with:
#ifndef __ATMEL_NAND_H__
However, the file that was added was simply called atmel.h
and this caused avr32 defconfig to fail with:
In file included from arch/avr32/boards/atstk1000/setup.c:22:
arch/avr32/mach-at32ap/include/mach/board.h:10:44: error: linux/platform_data/atmel_nand.h: No such file or directory
In file included from arch/avr32/boards/atstk1000/setup.c:22:
arch/avr32/mach-at32ap/include/mach/board.h:121: warning: 'struct atmel_nand_data' declared inside parameter list
arch/avr32/mach-at32ap/include/mach/board.h:121: warning: its scope is only this definition or declaration, which is probably not what you want
make[2]: *** [arch/avr32/boards/atstk1000/setup.o] Error 1
It seems the scope of the file contents will expand beyond
just nand, so ignore the original intention, and fix up the
users who reference the bad name with the _nand suffix.
CC: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
CC: David Woodhouse <dwmw2@infradead.org>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/avr32/mach-at32ap/include/mach/board.h | 2 +-
include/linux/platform_data/atmel.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index 7173386..70742ec 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -7,7 +7,7 @@
#include <linux/types.h>
#include <linux/serial.h>
#include <linux/platform_data/macb.h>
-#include <linux/platform_data/atmel_nand.h>
+#include <linux/platform_data/atmel.h>
#define GPIO_PIN_NONE (-1)
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index d056263..b0f2c56 100644
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@ -4,8 +4,8 @@
* GPL v2 Only
*/
-#ifndef __ATMEL_NAND_H__
-#define __ATMEL_NAND_H__
+#ifndef __ATMEL_H__
+#define __ATMEL_H__
#include <linux/mtd/nand.h>
@@ -24,4 +24,4 @@ struct atmel_nand_data {
unsigned int num_parts;
};
-#endif /* __ATMEL_NAND_H__ */
+#endif /* __ATMEL_H__ */
--
1.7.9.1
^ permalink raw reply related
* [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells
Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker, Bob Liu,
Mike Frysinger
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Commit 3bed8d67469cc7129b0babc0211c32fa68408ce0
"Disintegrate asm/system.h for Blackfin [ver #2]"
introduced arch/blackfin/include/asm/cmpxchg.h but has it also
including the asm-generic one which causes this:
CC arch/blackfin/kernel/asm-offsets.s
In file included from arch/blackfin/include/asm/cmpxchg.h:125:0,
from arch/blackfin/include/asm/atomic.h:10,
from include/linux/atomic.h:4,
from include/linux/spinlock.h:384,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/timex.h:56,
from include/linux/sched.h:57,
from arch/blackfin/kernel/asm-offsets.c:10:
include/asm-generic/cmpxchg.h:24:15: error: redefinition of '__xchg'
arch/blackfin/include/asm/cmpxchg.h:82:29: note: previous definition of '__xchg' was here
In file included from arch/blackfin/include/asm/atomic.h:10:0,
from include/linux/atomic.h:4,
from include/linux/spinlock.h:384,
from include/linux/seqlock.h:29,
from include/linux/time.h:8,
from include/linux/timex.h:56,
from include/linux/sched.h:57,
from arch/blackfin/kernel/asm-offsets.c:10:
arch/blackfin/include/asm/cmpxchg.h:129:0: warning: "xchg" redefined [enabled by default]
include/asm-generic/cmpxchg.h:81:0: note: this is the location of the previous definition
make[2]: *** [arch/blackfin/kernel/asm-offsets.s] Error 1
It really only needs two simple defines from asm-generic, so just
use those instead.
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/blackfin/include/asm/cmpxchg.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/blackfin/include/asm/cmpxchg.h b/arch/blackfin/include/asm/cmpxchg.h
index ba2484f..c05868c 100644
--- a/arch/blackfin/include/asm/cmpxchg.h
+++ b/arch/blackfin/include/asm/cmpxchg.h
@@ -122,7 +122,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
(unsigned long)(n), sizeof(*(ptr))))
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-#include <asm-generic/cmpxchg.h>
+#define cmpxchg(ptr, o, n) cmpxchg_local((ptr), (o), (n))
+#define cmpxchg64(ptr, o, n) cmpxchg64_local((ptr), (o), (n))
#endif /* !CONFIG_SMP */
--
1.7.9.1
^ permalink raw reply related
* [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells
Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker,
James E.J. Bottomley, Helge Deller
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Commit b4816afa3986704d1404fc48e931da5135820472
"Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h"
introduced the concept of asm/cmpxchg.h but the parisc arch
never got one. Fork the cmpxchg content out of the asm/atomic.h
file to create one.
Some minor whitespace fixups were done on the block of code that
created the new file.
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/parisc/include/asm/atomic.h | 107 +---------------------------------
arch/parisc/include/asm/cmpxchg.h | 116 +++++++++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+), 106 deletions(-)
create mode 100644 arch/parisc/include/asm/cmpxchg.h
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index 3ae5607..6c6defc 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -6,6 +6,7 @@
#define _ASM_PARISC_ATOMIC_H_
#include <linux/types.h>
+#include <asm/cmpxchg.h>
/*
* Atomic operations that C can't guarantee us. Useful for
@@ -48,112 +49,6 @@ extern arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
# define _atomic_spin_unlock_irqrestore(l,f) do { local_irq_restore(f); } while (0)
#endif
-/* This should get optimized out since it's never called.
-** Or get a link error if xchg is used "wrong".
-*/
-extern void __xchg_called_with_bad_pointer(void);
-
-
-/* __xchg32/64 defined in arch/parisc/lib/bitops.c */
-extern unsigned long __xchg8(char, char *);
-extern unsigned long __xchg32(int, int *);
-#ifdef CONFIG_64BIT
-extern unsigned long __xchg64(unsigned long, unsigned long *);
-#endif
-
-/* optimizer better get rid of switch since size is a constant */
-static __inline__ unsigned long
-__xchg(unsigned long x, __volatile__ void * ptr, int size)
-{
- switch(size) {
-#ifdef CONFIG_64BIT
- case 8: return __xchg64(x,(unsigned long *) ptr);
-#endif
- case 4: return __xchg32((int) x, (int *) ptr);
- case 1: return __xchg8((char) x, (char *) ptr);
- }
- __xchg_called_with_bad_pointer();
- return x;
-}
-
-
-/*
-** REVISIT - Abandoned use of LDCW in xchg() for now:
-** o need to test sizeof(*ptr) to avoid clearing adjacent bytes
-** o and while we are at it, could CONFIG_64BIT code use LDCD too?
-**
-** if (__builtin_constant_p(x) && (x == NULL))
-** if (((unsigned long)p & 0xf) == 0)
-** return __ldcw(p);
-*/
-#define xchg(ptr,x) \
- ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-
-
-#define __HAVE_ARCH_CMPXCHG 1
-
-/* bug catcher for when unsupported size is used - won't link */
-extern void __cmpxchg_called_with_bad_pointer(void);
-
-/* __cmpxchg_u32/u64 defined in arch/parisc/lib/bitops.c */
-extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old, unsigned int new_);
-extern unsigned long __cmpxchg_u64(volatile unsigned long *ptr, unsigned long old, unsigned long new_);
-
-/* don't worry...optimizer will get rid of most of this */
-static __inline__ unsigned long
-__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
-{
- switch(size) {
-#ifdef CONFIG_64BIT
- case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new_);
-#endif
- case 4: return __cmpxchg_u32((unsigned int *)ptr, (unsigned int) old, (unsigned int) new_);
- }
- __cmpxchg_called_with_bad_pointer();
- return old;
-}
-
-#define cmpxchg(ptr,o,n) \
- ({ \
- __typeof__(*(ptr)) _o_ = (o); \
- __typeof__(*(ptr)) _n_ = (n); \
- (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_, \
- (unsigned long)_n_, sizeof(*(ptr))); \
- })
-
-#include <asm-generic/cmpxchg-local.h>
-
-static inline unsigned long __cmpxchg_local(volatile void *ptr,
- unsigned long old,
- unsigned long new_, int size)
-{
- switch (size) {
-#ifdef CONFIG_64BIT
- case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new_);
-#endif
- case 4: return __cmpxchg_u32(ptr, old, new_);
- default:
- return __cmpxchg_local_generic(ptr, old, new_, size);
- }
-}
-
-/*
- * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
- * them available.
- */
-#define cmpxchg_local(ptr, o, n) \
- ((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o), \
- (unsigned long)(n), sizeof(*(ptr))))
-#ifdef CONFIG_64BIT
-#define cmpxchg64_local(ptr, o, n) \
- ({ \
- BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
- cmpxchg_local((ptr), (o), (n)); \
- })
-#else
-#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-#endif
-
/*
* Note that we need not lock read accesses - aligned word writes/reads
* are atomic, so a reader never sees inconsistent values.
diff --git a/arch/parisc/include/asm/cmpxchg.h b/arch/parisc/include/asm/cmpxchg.h
new file mode 100644
index 0000000..dbd1335
--- /dev/null
+++ b/arch/parisc/include/asm/cmpxchg.h
@@ -0,0 +1,116 @@
+/*
+ * forked from parisc asm/atomic.h which was:
+ * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
+ * Copyright (C) 2006 Kyle McMartin <kyle@parisc-linux.org>
+ */
+
+#ifndef _ASM_PARISC_CMPXCHG_H_
+#define _ASM_PARISC_CMPXCHG_H_
+
+/* This should get optimized out since it's never called.
+** Or get a link error if xchg is used "wrong".
+*/
+extern void __xchg_called_with_bad_pointer(void);
+
+/* __xchg32/64 defined in arch/parisc/lib/bitops.c */
+extern unsigned long __xchg8(char, char *);
+extern unsigned long __xchg32(int, int *);
+#ifdef CONFIG_64BIT
+extern unsigned long __xchg64(unsigned long, unsigned long *);
+#endif
+
+/* optimizer better get rid of switch since size is a constant */
+static inline unsigned long
+__xchg(unsigned long x, __volatile__ void *ptr, int size)
+{
+ switch (size) {
+#ifdef CONFIG_64BIT
+ case 8: return __xchg64(x, (unsigned long *) ptr);
+#endif
+ case 4: return __xchg32((int) x, (int *) ptr);
+ case 1: return __xchg8((char) x, (char *) ptr);
+ }
+ __xchg_called_with_bad_pointer();
+ return x;
+}
+
+/*
+** REVISIT - Abandoned use of LDCW in xchg() for now:
+** o need to test sizeof(*ptr) to avoid clearing adjacent bytes
+** o and while we are at it, could CONFIG_64BIT code use LDCD too?
+**
+** if (__builtin_constant_p(x) && (x == NULL))
+** if (((unsigned long)p & 0xf) == 0)
+** return __ldcw(p);
+*/
+#define xchg(ptr, x) \
+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
+
+#define __HAVE_ARCH_CMPXCHG 1
+
+/* bug catcher for when unsupported size is used - won't link */
+extern void __cmpxchg_called_with_bad_pointer(void);
+
+/* __cmpxchg_u32/u64 defined in arch/parisc/lib/bitops.c */
+extern unsigned long __cmpxchg_u32(volatile unsigned int *m, unsigned int old,
+ unsigned int new_);
+extern unsigned long __cmpxchg_u64(volatile unsigned long *ptr,
+ unsigned long old, unsigned long new_);
+
+/* don't worry...optimizer will get rid of most of this */
+static inline unsigned long
+__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
+{
+ switch (size) {
+#ifdef CONFIG_64BIT
+ case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new_);
+#endif
+ case 4: return __cmpxchg_u32((unsigned int *)ptr,
+ (unsigned int)old, (unsigned int)new_);
+ }
+ __cmpxchg_called_with_bad_pointer();
+ return old;
+}
+
+#define cmpxchg(ptr, o, n) \
+({ \
+ __typeof__(*(ptr)) _o_ = (o); \
+ __typeof__(*(ptr)) _n_ = (n); \
+ (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_, \
+ (unsigned long)_n_, sizeof(*(ptr))); \
+})
+
+#include <asm-generic/cmpxchg-local.h>
+
+static inline unsigned long __cmpxchg_local(volatile void *ptr,
+ unsigned long old,
+ unsigned long new_, int size)
+{
+ switch (size) {
+#ifdef CONFIG_64BIT
+ case 8: return __cmpxchg_u64((unsigned long *)ptr, old, new_);
+#endif
+ case 4: return __cmpxchg_u32(ptr, old, new_);
+ default:
+ return __cmpxchg_local_generic(ptr, old, new_, size);
+ }
+}
+
+/*
+ * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
+ * them available.
+ */
+#define cmpxchg_local(ptr, o, n) \
+ ((__typeof__(*(ptr)))__cmpxchg_local((ptr), (unsigned long)(o), \
+ (unsigned long)(n), sizeof(*(ptr))))
+#ifdef CONFIG_64BIT
+#define cmpxchg64_local(ptr, o, n) \
+({ \
+ BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
+ cmpxchg_local((ptr), (o), (n)); \
+})
+#else
+#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
+#endif
+
+#endif /* _ASM_PARISC_CMPXCHG_H_ */
--
1.7.9.1
^ permalink raw reply related
* [PATCH 07/11] sh: fix several build failures from system.h fallout
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker, Paul Mundt
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
commit e839ca528718e68cad32a307dc9aabf01ef3eb05
"Disintegrate asm/system.h for SH"
created the new file asm/cache_insns.h but it didn't add
an include for all the users of it.
The failure on fpu.c (also seen below) showed up roughly
at the same time, and since the fix is trivial (include traps.h)
I did not bother to bisect to 100% confirm it was caused by
the system.h disintegration.
arch/sh/mm/flush-sh4.c:16:2: error: implicit declaration of function 'register_align' [-Werror=implicit-function-declaration]
arch/sh/mm/flush-sh4.c:23:3: error: implicit declaration of function '__ocbwb' [-Werror=implicit-function-declaration]
arch/sh/mm/flush-sh4.c:57:3: error: implicit declaration of function '__ocbp' [-Werror=implicit-function-declaration]
arch/sh/mm/flush-sh4.c:87:3: error: implicit declaration of function '__ocbi' [-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors
make[2]: *** [arch/sh/mm/flush-sh4.o] Error 1
arch/sh/mm/cache-sh4.c:70:3: error: implicit declaration of function '__ocbwb' [-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors
make[2]: *** [arch/sh/mm/cache-sh4.o] Error 1
arch/sh/kernel/cpu/fpu.c:81:2: error: 'TRAP_HANDLER_DECL' undeclared (first use in this function)
arch/sh/kernel/cpu/fpu.c:83:20: error: 'regs' undeclared (first use in this function)
arch/sh/kernel/cpu/fpu.c:83:19: error: called object 'fpu_state_restore' is not a function
make[3]: *** [arch/sh/kernel/cpu/fpu.o] Error 1
arch/sh/kernel/cpu/sh4/fpu.c:407:2: error: 'TRAP_HANDLER_DECL' undeclared (first use in this function)
arch/sh/kernel/cpu/sh4/fpu.c:409:20: error: 'regs' undeclared (first use in this function)
make[4]: *** [arch/sh/kernel/cpu/sh4/fpu.o] Error 1
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/sh/kernel/cpu/fpu.c | 1 +
arch/sh/kernel/cpu/sh4/fpu.c | 1 +
arch/sh/mm/cache-sh4.c | 1 +
arch/sh/mm/flush-sh4.c | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/sh/kernel/cpu/fpu.c b/arch/sh/kernel/cpu/fpu.c
index 7f1b70c..07fb02f 100644
--- a/arch/sh/kernel/cpu/fpu.c
+++ b/arch/sh/kernel/cpu/fpu.c
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <asm/processor.h>
+#include <asm/traps.h>
#include <asm/fpu.h>
int init_fpu(struct task_struct *tsk)
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c
index e74cd6c..36538ff 100644
--- a/arch/sh/kernel/cpu/sh4/fpu.c
+++ b/arch/sh/kernel/cpu/sh4/fpu.c
@@ -15,6 +15,7 @@
#include <linux/io.h>
#include <cpu/fpu.h>
#include <asm/processor.h>
+#include <asm/traps.h>
#include <asm/fpu.h>
/* The PR (precision) bit in the FP Status Register must be clear when
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 112fea1..c9667d9 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
+#include <asm/cache_insns.h>
/*
* The maximum number of pages we support up to when doing ranged dcache
diff --git a/arch/sh/mm/flush-sh4.c b/arch/sh/mm/flush-sh4.c
index 75a17f5..59acd8a 100644
--- a/arch/sh/mm/flush-sh4.c
+++ b/arch/sh/mm/flush-sh4.c
@@ -1,6 +1,7 @@
#include <linux/mm.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
+#include <asm/cache_insns.h>
#include <asm/traps.h>
/*
--
1.7.9.1
^ permalink raw reply related
* [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
To fix:
arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: data definition has no type or storage class [enabled by default]
arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
arch/frv/mb93090-mb00/pci-dma.c:31:1: warning: parameter names (without types) in function declaration [enabled by default]
arch/frv/mb93090-mb00/pci-dma.c:38:1: warning: data definition has no type or storage class [enabled by default]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/frv/mb93090-mb00/pci-dma.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c
index 41098a3..4f8d8bc 100644
--- a/arch/frv/mb93090-mb00/pci-dma.c
+++ b/arch/frv/mb93090-mb00/pci-dma.c
@@ -13,6 +13,7 @@
#include <linux/dma-mapping.h>
#include <linux/list.h>
#include <linux/pci.h>
+#include <linux/export.h>
#include <linux/highmem.h>
#include <linux/scatterlist.h>
#include <asm/io.h>
--
1.7.9.1
^ permalink raw reply related
* [PATCH 10/11] tile: fix multiple build failures from system.h dismantle
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells
Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker, Chris Metcalf
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Commit bd119c69239322caafdb64517a806037d0d0c70a
"Disintegrate asm/system.h for Tile"
created the asm/switch_to.h file, but did not add an include
of it to all its users.
Also, commit b4816afa3986704d1404fc48e931da5135820472
"Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h"
introduced the concept of asm/cmpxchg.h but the tile arch
never got one. Fork the cmpxchg content out of the asm/atomic.h
file to create one.
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/tile/include/asm/atomic.h | 50 +-------------------------
arch/tile/include/asm/cmpxchg.h | 73 +++++++++++++++++++++++++++++++++++++++
arch/tile/kernel/process.c | 1 +
arch/tile/kernel/stack.c | 1 +
4 files changed, 77 insertions(+), 48 deletions(-)
create mode 100644 arch/tile/include/asm/cmpxchg.h
diff --git a/arch/tile/include/asm/atomic.h b/arch/tile/include/asm/atomic.h
index bb696da..f246142 100644
--- a/arch/tile/include/asm/atomic.h
+++ b/arch/tile/include/asm/atomic.h
@@ -17,6 +17,8 @@
#ifndef _ASM_TILE_ATOMIC_H
#define _ASM_TILE_ATOMIC_H
+#include <asm/cmpxchg.h>
+
#ifndef __ASSEMBLY__
#include <linux/compiler.h>
@@ -121,54 +123,6 @@ static inline int atomic_read(const atomic_t *v)
*/
#define atomic_add_negative(i, v) (atomic_add_return((i), (v)) < 0)
-/* Nonexistent functions intended to cause link errors. */
-extern unsigned long __xchg_called_with_bad_pointer(void);
-extern unsigned long __cmpxchg_called_with_bad_pointer(void);
-
-#define xchg(ptr, x) \
- ({ \
- typeof(*(ptr)) __x; \
- switch (sizeof(*(ptr))) { \
- case 4: \
- __x = (typeof(__x))(typeof(__x-__x))atomic_xchg( \
- (atomic_t *)(ptr), \
- (u32)(typeof((x)-(x)))(x)); \
- break; \
- case 8: \
- __x = (typeof(__x))(typeof(__x-__x))atomic64_xchg( \
- (atomic64_t *)(ptr), \
- (u64)(typeof((x)-(x)))(x)); \
- break; \
- default: \
- __xchg_called_with_bad_pointer(); \
- } \
- __x; \
- })
-
-#define cmpxchg(ptr, o, n) \
- ({ \
- typeof(*(ptr)) __x; \
- switch (sizeof(*(ptr))) { \
- case 4: \
- __x = (typeof(__x))(typeof(__x-__x))atomic_cmpxchg( \
- (atomic_t *)(ptr), \
- (u32)(typeof((o)-(o)))(o), \
- (u32)(typeof((n)-(n)))(n)); \
- break; \
- case 8: \
- __x = (typeof(__x))(typeof(__x-__x))atomic64_cmpxchg( \
- (atomic64_t *)(ptr), \
- (u64)(typeof((o)-(o)))(o), \
- (u64)(typeof((n)-(n)))(n)); \
- break; \
- default: \
- __cmpxchg_called_with_bad_pointer(); \
- } \
- __x; \
- })
-
-#define tas(ptr) (xchg((ptr), 1))
-
#endif /* __ASSEMBLY__ */
#ifndef __tilegx__
diff --git a/arch/tile/include/asm/cmpxchg.h b/arch/tile/include/asm/cmpxchg.h
new file mode 100644
index 0000000..276f067
--- /dev/null
+++ b/arch/tile/include/asm/cmpxchg.h
@@ -0,0 +1,73 @@
+/*
+ * cmpxchg.h -- forked from asm/atomic.h with this copyright:
+ *
+ * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT. See the GNU General Public License for
+ * more details.
+ *
+ */
+
+#ifndef _ASM_TILE_CMPXCHG_H
+#define _ASM_TILE_CMPXCHG_H
+
+#ifndef __ASSEMBLY__
+
+/* Nonexistent functions intended to cause link errors. */
+extern unsigned long __xchg_called_with_bad_pointer(void);
+extern unsigned long __cmpxchg_called_with_bad_pointer(void);
+
+#define xchg(ptr, x) \
+ ({ \
+ typeof(*(ptr)) __x; \
+ switch (sizeof(*(ptr))) { \
+ case 4: \
+ __x = (typeof(__x))(typeof(__x-__x))atomic_xchg( \
+ (atomic_t *)(ptr), \
+ (u32)(typeof((x)-(x)))(x)); \
+ break; \
+ case 8: \
+ __x = (typeof(__x))(typeof(__x-__x))atomic64_xchg( \
+ (atomic64_t *)(ptr), \
+ (u64)(typeof((x)-(x)))(x)); \
+ break; \
+ default: \
+ __xchg_called_with_bad_pointer(); \
+ } \
+ __x; \
+ })
+
+#define cmpxchg(ptr, o, n) \
+ ({ \
+ typeof(*(ptr)) __x; \
+ switch (sizeof(*(ptr))) { \
+ case 4: \
+ __x = (typeof(__x))(typeof(__x-__x))atomic_cmpxchg( \
+ (atomic_t *)(ptr), \
+ (u32)(typeof((o)-(o)))(o), \
+ (u32)(typeof((n)-(n)))(n)); \
+ break; \
+ case 8: \
+ __x = (typeof(__x))(typeof(__x-__x))atomic64_cmpxchg( \
+ (atomic64_t *)(ptr), \
+ (u64)(typeof((o)-(o)))(o), \
+ (u64)(typeof((n)-(n)))(n)); \
+ break; \
+ default: \
+ __cmpxchg_called_with_bad_pointer(); \
+ } \
+ __x; \
+ })
+
+#define tas(ptr) (xchg((ptr), 1))
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_TILE_CMPXCHG_H */
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 30caeca..ee01b1c 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -28,6 +28,7 @@
#include <linux/tracehook.h>
#include <linux/signal.h>
#include <asm/stack.h>
+#include <asm/switch_to.h>
#include <asm/homecache.h>
#include <asm/syscalls.h>
#include <asm/traps.h>
diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c
index 37ee4d0..0be6b01 100644
--- a/arch/tile/kernel/stack.c
+++ b/arch/tile/kernel/stack.c
@@ -25,6 +25,7 @@
#include <asm/page.h>
#include <asm/tlbflush.h>
#include <asm/ucontext.h>
+#include <asm/switch_to.h>
#include <asm/sigframe.h>
#include <asm/stack.h>
#include <arch/abi.h>
--
1.7.9.1
^ permalink raw reply related
* [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells
Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker, Arnd Bergmann,
Jonas Bonn
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Builds of the openrisc or1ksim_defconfig show the following:
In file included from arch/openrisc/include/generated/asm/cmpxchg.h:1:0,
from include/asm-generic/atomic.h:18,
from arch/openrisc/include/generated/asm/atomic.h:1,
from include/linux/atomic.h:4,
from include/linux/dcache.h:4,
from fs/notify/fsnotify.c:19:
include/asm-generic/cmpxchg.h: In function '__xchg':
include/asm-generic/cmpxchg.h:34:20: error: expected ')' before 'u8'
include/asm-generic/cmpxchg.h:34:20: warning: type defaults to 'int' in type name
and many more lines of similar errors. It seems specific to the or32
because most other platforms have an arch specific component that would
have already included types.h ahead of time, but the o32 does not.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jonas Bonn <jonas@southpole.se>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
include/asm-generic/cmpxchg.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/asm-generic/cmpxchg.h b/include/asm-generic/cmpxchg.h
index 8a36183..1488302 100644
--- a/include/asm-generic/cmpxchg.h
+++ b/include/asm-generic/cmpxchg.h
@@ -10,6 +10,7 @@
#error "Cannot use generic cmpxchg on SMP"
#endif
+#include <linux/types.h>
#include <linux/irqflags.h>
#ifndef xchg
--
1.7.9.1
^ permalink raw reply related
* [PATCH 03/11] avr32: fix nop compile fails from system.h split up
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
To fix:
In file included from kernel/exit.c:61:
arch/avr32/include/asm/mmu_context.h: In function 'enable_mmu':
arch/avr32/include/asm/mmu_context.h:135: error: implicit
declaration of function 'nop'
It needs an include of the new file created in:
commit ae473946586680b01c13975a3b674de23ad7c93e
"Disintegrate asm/system.h for AVR32"
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/avr32/include/asm/mmu_context.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/avr32/include/asm/mmu_context.h b/arch/avr32/include/asm/mmu_context.h
index 27ff234..f1b2fec 100644
--- a/arch/avr32/include/asm/mmu_context.h
+++ b/arch/avr32/include/asm/mmu_context.h
@@ -14,6 +14,7 @@
#include <asm/tlbflush.h>
#include <asm/sysreg.h>
+#include <asm/special_insns.h>
#include <asm-generic/mm_hooks.h>
/*
--
1.7.9.1
^ permalink raw reply related
* [PATCH 09/11] firewire: restore the device.h include in linux/firewire.h
From: Paul Gortmaker @ 2012-04-01 20:38 UTC (permalink / raw)
To: dhowells; +Cc: torvalds, linux-kernel, linux-next, Paul Gortmaker
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
Commit 313162d0b83836e2f57e51b9b8650fb4b9c396ea
"device.h: audit and cleanup users in main include dir"
exchanged an include <linux/device.h> for a struct *device
but in actuality I misread this file when creating 313162d
and it should have remained an include.
There were no build regressions since all consumers were
already getting device.h anyway, but make it right regardless.
Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
include/linux/firewire.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 4db7b68..cdc9b71 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -2,6 +2,7 @@
#define _LINUX_FIREWIRE_H
#include <linux/completion.h>
+#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/kernel.h>
#include <linux/kref.h>
@@ -64,8 +65,6 @@
#define CSR_MODEL 0x17
#define CSR_DIRECTORY_ID 0x20
-struct device;
-
struct fw_csr_iterator {
const u32 *p;
const u32 *end;
--
1.7.9.1
^ permalink raw reply related
* Re: [PATCH 00/11] Fix up more asm/system.h fallout
From: Stephen Rothwell @ 2012-04-02 0:03 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: dhowells, torvalds, linux-kernel, linux-next
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
Hi Paul,
On Sun, 1 Apr 2012 16:38:36 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> Like others, I was surprised it didn't get a soak in linux-next
> before being merged, but I guess what is done is done, so lets
> try and limit the fallout from having any wider of a commit range
> than it already does.
>
> It is all system.h stuff except for three things.
>
> 1) an avr32 patch I'd created but the avr32 guys hadn't got
> signed keys yet, so I might as well get it in here along
> with other similar build fail fixes (the atmel one).
>
> 2) A cosmetic fix to the device.h changeset from me earlier.
>
> 3) A trivial warning fix to an arch/frv specific file.
>
> I'm going to queue this up in my feed branch to linux-next
> so we can start reducing the number of build failures from what
> we had on Friday.
Thanks for all this. Please feed them to Linus as soon as sensible i.e.
after you get some feedback from the affected arch maintainers etc.
Maybe you should repost some of these with more cc's on them.
I look forward to less blood on the ground in today's linux-next
builds :-)
--
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 tile tree with Linus' tree
From: Stephen Rothwell @ 2012-04-02 0:37 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-next, linux-kernel, David Howells, Linus
[-- Attachment #1: Type: text/plain, Size: 925 bytes --]
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in
arch/tile/include/asm/pgtable.h between commit bd119c692393
("Disintegrate asm/system.h for Tile") from Linus' tree and commit
7dc0069e58f6 ("arch/tile: Allow tilegx to build with either 16K or 64K
page size") from the tile 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/tile/include/asm/pgtable.h
index 6749091,ff01704..0000000
--- a/arch/tile/include/asm/pgtable.h
+++ b/arch/tile/include/asm/pgtable.h
@@@ -27,8 -27,11 +27,10 @@@
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/spinlock.h>
+ #include <linux/pfn.h>
#include <asm/processor.h>
#include <asm/fixmap.h>
-#include <asm/system.h>
+ #include <asm/page.h>
struct mm_struct;
struct vm_area_struct;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tile tree with Linus' tree
From: Stephen Rothwell @ 2012-04-02 0:46 UTC (permalink / raw)
To: Chris Metcalf; +Cc: linux-next, linux-kernel, David Howells, Linus
[-- Attachment #1: Type: text/plain, Size: 1943 bytes --]
Hi Chris,
Today's linux-next merge of the tile tree got a conflict in
arch/tile/include/asm/barrier.h (actually setup.h - git tried its best)
between commit bd119c692393 ("Disintegrate asm/system.h for Tile") from
Linus' tree and commit 8507ce994794 ("arch/tile: fix hardwall for tilegx
and generalize for idn and ipi") from the tile tree.
I used the upstream version of barrier.h and applied the following merge
fixup.
It may be worth while rebasing the tile tree on top of v3.4-rc1 or
(maybe better) merging 3.4-rc1 into the tile tree.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Apr 2012 10:41:41 +1000
Subject: [PATCH] tile: apply changes after system/h break up
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/tile/include/asm/setup.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/tile/include/asm/setup.h b/arch/tile/include/asm/setup.h
index e58613e..c67eb70 100644
--- a/arch/tile/include/asm/setup.h
+++ b/arch/tile/include/asm/setup.h
@@ -41,15 +41,15 @@ void restrict_dma_mpls(void);
#ifdef CONFIG_HARDWALL
/* User-level network management functions */
void reset_network_state(void);
-void grant_network_mpls(void);
-void restrict_network_mpls(void);
struct task_struct;
-int hardwall_deactivate(struct task_struct *task);
+void hardwall_switch_tasks(struct task_struct *prev, struct task_struct *next);
+void hardwall_deactivate_all(struct task_struct *task);
+int hardwall_ipi_valid(int cpu);
/* Hook hardwall code into changes in affinity. */
#define arch_set_cpus_allowed(p, new_mask) do { \
- if (p->thread.hardwall && !cpumask_equal(&p->cpus_allowed, new_mask)) \
- hardwall_deactivate(p); \
+ if (!cpumask_equal(&p->cpus_allowed, new_mask)) \
+ hardwall_deactivate_all(p); \
} while (0)
#endif
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
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