06 Jan, 2009
2 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (30 commits)
sparc: Fix minor SPARC32 compile error
sparc: Remove reg*.h from Kbuild
sparc: Clean arch-specific code in prom_common.c
sparc: Kill asm/reg*.h
sparc: Use 64BIT config entry
MAINTAINERS: update sparc maintainer
sparc: unify ipcbuf.h
sparc: Update 64-bit defconfig.
sparc: remove NO_PROC_ID - it is no longer used
sparc: drop get_tbr() in traps.h
sparc: fix warning in userspace header traps.h
sparc: fix warnings in userspace header byteorder.h
sparc: fix warning in userspace header jsflash.h
sparc: unify openprom.h
sparc64: delete unused linux_prom64_ranges from openprom_64.h
sparc: prepare openprom for unification
sparc: remove linux_prom_pci_assigned_addresses from openprom_32.h
sparc: remove ebus definitions from openprom*.h
sparc: unify siginfo.h
sparc: unify ptrace.h
... -
When CONFIG_PROC_FS is unset, include/linux/interrupt.h defines
init_irq_proc() as an empty function.arch/sparc/kernel/irq_32.c defines this function unconditionally.
Fix the latter so that it only defines this function when CONFIG_PROC_FS
is set.This fixes the following error:
arch/sparc/kernel/irq_32.c:672: error: redefinition of 'init_irq_proc'
include/linux/interrupt.h:461: error: previous definition of
'init_irq_proc' was hereThis was found using randconfig builds.
Signed-off-by: Julian Calaby
Signed-off-by: David S. Miller
05 Jan, 2009
5 commits
-
Forgot to commit this in previous change, noticed by
Sam.Signed-off-by: David S. Miller
-
prom_nextprop() and prom_firstprop() have slightly different calling
conventions in 32 and 64 bit SPARC.prom_common.c uses a ifdef guard to ensure that these functions are
called correctly.Adjust code to eliminate this ifdef by using a calling convention that
is compatible with both 32 and 64 bit SPARC.Signed-off-by: Julian Calaby
Reviewed-by: Sam Ravnborg
Signed-off-by: David S. Miller -
As noticed by Sam Ravnborg, these aren't use for anything.
Neither the kernel nor userland make a reference to this
family of header files.So just get rid of them.
Signed-off-by: David S. Miller
-
Use 64BIT config entry to distinguish between 32 and 64bit builds
instead of relying on the ARCH setting. Using sparc64 as ARCH still
forces 64BIT on.Inspired by the x86 and s390 configs.
[ Integrated CONFIG_64BIT help text suggestions from Sam -DaveM ]
Signed-off-by: Bastian Blank
Tested-by: Sam Ravnborg
Signed-off-by: David S. Miller -
The ony difference is the size of the mode.
sparc has extra padding to compensate for this.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller
04 Jan, 2009
1 commit
-
…/git/tip/linux-2.6-tip
* 'cpus4096-for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (77 commits)
x86: setup_per_cpu_areas() cleanup
cpumask: fix compile error when CONFIG_NR_CPUS is not defined
cpumask: use alloc_cpumask_var_node where appropriate
cpumask: convert shared_cpu_map in acpi_processor* structs to cpumask_var_t
x86: use cpumask_var_t in acpi/boot.c
x86: cleanup some remaining usages of NR_CPUS where s/b nr_cpu_ids
sched: put back some stack hog changes that were undone in kernel/sched.c
x86: enable cpus display of kernel_max and offlined cpus
ia64: cpumask fix for is_affinity_mask_valid()
cpumask: convert RCU implementations, fix
xtensa: define __fls
mn10300: define __fls
m32r: define __fls
h8300: define __fls
frv: define __fls
cris: define __fls
cpumask: CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
cpumask: zero extra bits in alloc_cpumask_var_node
cpumask: replace for_each_cpu_mask_nr with for_each_cpu in kernel/time/
cpumask: convert mm/
...
03 Jan, 2009
24 commits
-
Signed-off-by: David S. Miller
-
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
get_tbr() has no users in the whole tree -drop it.
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Fix following warning:
traps.h:23: extern's make no sense in userspaceAdd an ifdef __KERNEL__ block that cover the
extern definition and a few related things that neither
is for userspace.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Fix following warnings in byteorder.h:
byteorder.h:4: include of is preferred over
byteorder.h:9: leaks CONFIG_SPARC32 to userspace where it is not valid
byteorder.h:13: leaks CONFIG_SPARC64 to userspace where it is not valid
byteorder.h:14: found __[us]{8,16,32,64} type without #include
byteorder.h:47: leaks CONFIG_SPARC64 to userspace where it is not valid- changed to use include as suggested
- use preprocessor defined symbols to distingush between 32 and 64 bitSigned-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Fix following warnings in jsflash.h:
jsflash.h:11: include of is preferred over
jsflash.h:24: found __[us]{8,16,32,64} type without #includeFixed by changing the include to
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
After the preparational steps the unification was simple.
The linux_prom_pci_registers definition did not look like
it could be unified at first look since the structure is assigned
using prop_getproperty() / of_get_property() so the structure
is assumed to come direct form the prom.The LINUX_OPPROM_MAGIC was kept even if it is not used by the kernel
on the assumption that userspace may require it.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
It was not used over the whole tree - so drop it.
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Align the sparc and sparc64 versions so differences are minimal.
A few data types are changed to better reflect there actual usage.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
It is not used anywhere in the tree so drop it.
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Looks like leftovers from the removal of the special ebus layer.
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Trivial unification where the sparc64 specific
parts are protected using a signle ifdef/endif pair.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
The two ptrace.h implementations are very alike but
the small differences required two set of ifdef/else/endif pairs.The definition of reg_window32 could have been shared but
that would have required several updates in sparc32 code as
all printk formatting for example assume it is longs.sparc_stackf looked like anohter candidate to share if the 32
bit was renamed to sparc_stackf32.
But it contains two pointers in the sparc32 version which would
have been 64 bit in the sparc64 version so it was non-trivial.
Using a set of accessor macros could do the trick if pursued later.The sparc64 specific definitions are not protected by
ifdef - as it should not be required to do so.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
With the renamed types in place the unification was straightforward.
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Renaming a few types to contain a 32 suffix makes the
type names compatible with sparc64 and thus makes sharing
between the two a lot easier.Note: None of these definitions are expected part of the
stable ABI towards userspace.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
They were almost identical and with the preapration
patch nothing was needed to be added.The unified version contains a few sparc64 only definitions
but they are kept as is and not protected by ifdef/endif.
The unified version exports a bit more to userspace then the
32 bit version did.
This is not considered fatal.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
o add a sparc32 only definition
o fix a few style issues (white space errors etc).
o include compiler.h (for __user)Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Noticed by Geert Uytterhoeven.
Signed-off-by: David S. Miller
-
To my suprise struct stat64 was not equal on sparc 32 and sparc64,
so there was really nothing to share here.
Unify the files by adding their respective content to stat.h.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
Like sparc64 use proper types in struct stat
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
sparc32 does not define __ARCH_WANT_OLD_STAT so
we do not use this structure neither do we support it.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
The posix types differed so much in their definition
that they are kept in separate blocks.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
There is no need to define a config symbol if
it is never set to any value. Undefined symbols equal
to 'n'.GENERIC_GPIO looks like it is similar but
it is set using select in some other file so
it must be kept.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
…/git/tip/linux-2.6-tip
* 'cpus4096-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (66 commits)
x86: export vector_used_by_percpu_irq
x86: use logical apicid in x2apic_cluster's x2apic_cpu_mask_to_apicid_and()
sched: nominate preferred wakeup cpu, fix
x86: fix lguest used_vectors breakage, -v2
x86: fix warning in arch/x86/kernel/io_apic.c
sched: fix warning in kernel/sched.c
sched: move test_sd_parent() to an SMP section of sched.h
sched: add SD_BALANCE_NEWIDLE at MC and CPU level for sched_mc>0
sched: activate active load balancing in new idle cpus
sched: bias task wakeups to preferred semi-idle packages
sched: nominate preferred wakeup cpu
sched: favour lower logical cpu number for sched_mc balance
sched: framework for sched_mc/smt_power_savings=N
sched: convert BALANCE_FOR_xx_POWER to inline functions
x86: use possible_cpus=NUM to extend the possible cpus allowed
x86: fix cpu_mask_to_apicid_and to include cpu_online_mask
x86: update io_apic.c to the new cpumask code
x86: Introduce topology_core_cpumask()/topology_thread_cpumask()
x86: xen: use smp_call_function_many()
x86: use work_on_cpu in x86/kernel/cpu/mcheck/mce_amd_64.c
...Fixed up trivial conflict in kernel/time/tick-sched.c manually
01 Jan, 2009
2 commits
-
Impact: New API
The old topology_core_siblings() and topology_thread_siblings() return
a cpumask_t; these new ones return a (const) struct cpumask *.Signed-off-by: Rusty Russell
Signed-off-by: Mike Travis -
Signed-off-by: Al Viro
31 Dec, 2008
1 commit
-
Conflicts:
arch/x86/kernel/io_apic.c
30 Dec, 2008
1 commit
29 Dec, 2008
2 commits
-
Conflicts:
arch/sparc64/kernel/idprom.c -
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (144 commits)
powerpc/44x: Support 16K/64K base page sizes on 44x
powerpc: Force memory size to be a multiple of PAGE_SIZE
powerpc/32: Wire up the trampoline code for kdump
powerpc/32: Add the ability for a classic ppc kernel to be loaded at 32M
powerpc/32: Allow __ioremap on RAM addresses for kdump kernel
powerpc/32: Setup OF properties for kdump
powerpc/32/kdump: Implement crash_setup_regs() using ppc_save_regs()
powerpc: Prepare xmon_save_regs for use with kdump
powerpc: Remove default kexec/crash_kernel ops assignments
powerpc: Make default kexec/crash_kernel ops implicit
powerpc: Setup OF properties for ppc32 kexec
powerpc/pseries: Fix cpu hotplug
powerpc: Fix KVM build on ppc440
powerpc/cell: add QPACE as a separate Cell platform
powerpc/cell: fix build breakage with CONFIG_SPUFS disabled
powerpc/mpc5200: fix error paths in PSC UART probe function
powerpc/mpc5200: add rts/cts handling in PSC UART driver
powerpc/mpc5200: Make PSC UART driver update serial errors counters
powerpc/mpc5200: Remove obsolete code from mpc5200 MDIO driver
powerpc/mpc5200: Add MDMA/UDMA support to MPC5200 ATA driver
...Fix trivial conflict in drivers/char/Makefile as per Paul's directions
27 Dec, 2008
2 commits
-
It is counter intuitive to have the select listed
as part of the PCI option.
Move the select to the SPARC64 specific part of the config.PCI_MSI has a dependency on PCI so it does not harm to have
it always selected.Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller -
SUN_IO is always 'y' so drop it and thus killing an ifdef/endif pair
Signed-off-by: Sam Ravnborg
Signed-off-by: David S. Miller