27 Apr, 2009
1 commit
-
Signed-off-by: Tim Abbott
Cc: Chris Zankel
Acked-by: Sam Ravnborg
Signed-off-by: Linus Torvalds
06 Apr, 2009
1 commit
-
* 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
tracing, net: fix net tree and tracing tree merge interaction
tracing, powerpc: fix powerpc tree and tracing tree interaction
ring-buffer: do not remove reader page from list on ring buffer free
function-graph: allow unregistering twice
trace: make argument 'mem' of trace_seq_putmem() const
tracing: add missing 'extern' keywords to trace_output.h
tracing: provide trace_seq_reserve()
blktrace: print out BLK_TN_MESSAGE properly
blktrace: extract duplidate code
blktrace: fix memory leak when freeing struct blk_io_trace
blktrace: fix blk_probes_ref chaos
blktrace: make classic output more classic
blktrace: fix off-by-one bug
blktrace: fix the original blktrace
blktrace: fix a race when creating blk_tree_root in debugfs
blktrace: fix timestamp in binary output
tracing, Text Edit Lock: cleanup
tracing: filter fix for TRACE_EVENT_FORMAT events
ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
x86: kretprobe-booster interrupt emulation code fix
...Fix up trivial conflicts in
arch/parisc/include/asm/ftrace.h
include/linux/memory.h
kernel/extable.c
kernel/module.c
03 Apr, 2009
23 commits
-
Remove include statement to include asm/io.h.
Signed-off-by: Chris Zankel
-
We only add the platform or variant directory to core-y if it
contains a Makefile. Consequently, we can remove the Makefiles
for the dc232b and fsf processor variants.Signed-off-by: Chris Zankel
-
Move it from .text to .init.text to get rid of it after boot and
prevent illegal section references.Signed-off-by: Daniel Glöckner
Signed-off-by: Chris Zankel -
Switch to GENERIC_TIME by using the ccount register as a clock source.
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
platform_get/set_rtc_time() is not implemented by any of the supported
xtensa platforms. Remove the facility completely.The initial seconds for xtime come from read_persistent_clock() which
returns just 0 in the generic implementation. Platforms that sport a
persistent clock can implement this function.This is needed to implement the ccount as a clock source.
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Current xtensa implementation of sched_clock() is the same as the
generic one. Just remove it, the weak symbol in kernel/sched_clock.c
will be used instead.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Support for the S6105 IP Camera Reference Design Kit.
Signed-off-by: Johannes Weiner
Signed-off-by: Oskar Schirmer
Signed-off-by: Chris Zankel -
The linker script should not assume a fix offset in memory for the
kernel, this is platform-specific, so let the platform set it.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Support for the Stretch S6000 Xtensa core variant.
Signed-off-by: Johannes Weiner
Signed-off-by: Oskar Schirmer
Signed-off-by: Chris Zankel -
S6000 core configuration files from Tensilica.
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Allow the core variant code to provide irq enable/disable callbacks.
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Allow the variant to provide real code. Add empty dummy Makefiles for
the existing variants.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Add support for !CONFIG_MMU setups.
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Add the arch-specific header for flat support on xtensa in preparation
for the Xtensa S6000 nommu port.Signed-off-by: Oskar Schirmer
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
XCHAL_DATA_WIDTH is the maximum register width, slab caches should be
aligned to this.Theoretical fix as all variants have had an XCHAL_DATA_WIDTH of 4
(wordsize) for now. But the S6000 variant will raise this to 16.Signed-off-by: Oskar Schirmer
Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
The current assumption of the memory code is that the first RAM PFN in
the system is 0.Adjust the relevant code to play well with setups where memory starts
at higher addresses, indicated by PLATFORM_DEFAULT_MEM_START.The new memory model looks like this:
+----------+--+----------------------+----------------+
| | | | |
| | | RAM | |
| | | | |
+----------+--+----------------------+----------------+
| | | | |
+- PFN 0 | +- min_low_pfn +- max_low_pfn +- max_pfn
|
+- ARCH_PFN_OFFSET
+- PLATFORM_DEFAULT_MEM_START >> PAGE_SIZEThe memory map contains pages starting from pfn ARCH_PFN_OFFSET up to
max_low_pfn. The only zone used right now will span exactly the same
region.Usually, ARCH_PFN_OFFSET and min_low_pfn are the same value. Handle
them separately for robustness. Gapping pages will be in the memory
map but marked as reserved and won't be touched.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
If min_low_pfn is non-zero, the bitmap reserved for bootmem is bigger
than needed. The number of pages bootmem has to maintain is the range
from min_low_pfn to max_low_pfn.For now it has only been a theoretical mistake, min_low_pfn was always
zero.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
The second argument to init_bootmem_node() is the PFN to place the
bootmem bitmap at and the third argument is the first PFN on the node.This is currently backwards but never made any problems as both values
were always zero.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Right now, the xtensa stacktrace code reads the _current_ kernel stack
pointer if nothing is supplied. With debugging facilities like sysrq
this means that the backtrace of the sysrq-handler is printed instead
of a trace of the given task's stack.When no stack pointer is specified in show_trace() and show_stack(),
use the stack pointer that comes with the handed in task descriptor to
make stack traces more useful.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
Instead of making support code depend on variants or platforms, the
latter should select what they need explicitely.Otherwise this starts looking weird when support code depends on
!XTENSA_PLATFORM_FOO && !XTENSA_PLATFORM_BAR etc.This also includes some minor fixlets like converting bool and default
to def_bool and fixing indentation and whitespace errors.Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
This constant is defined in all core headers. Remove the redundant
definition which might error out if other includes lead to inclusion
of .Signed-off-by: Johannes Weiner
Signed-off-by: Chris Zankel -
First argument unused since 2.3.11.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Alexey Dobriyan
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
02 Apr, 2009
1 commit
-
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
01 Apr, 2009
1 commit
-
Signed-off-by: Alexey Dobriyan
Cc: Alan Cox
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
27 Mar, 2009
4 commits
-
…el/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
x86: headers cleanup - setup.h
emu101k1.h: fix duplicate include of <linux/types.h>
compiler-gcc4: conditionalize #error on __KERNEL__
remove __KERNEL_STRICT_NAMES
make netfilter use strict integer types
make drm headers use strict integer types
make MTD headers use strict integer types
make most exported headers use strict integer types
make exported headers use strict posix types
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
...Manually fix trivial conflicts in:
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h -
* 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
x86: disable __do_IRQ support
sparseirq, powerpc/cell: fix unused variable warning in interrupt.c
genirq: deprecate obsolete typedefs and defines
genirq: deprecate __do_IRQ
genirq: add doc to struct irqaction
genirq: use kzalloc instead of explicit zero initialization
genirq: make irqreturn_t an enum
genirq: remove redundant if condition
genirq: remove unused hw_irq_controller typedef
irq: export remove_irq() and setup_irq() symbols
irq: match remove_irq() args with setup_irq()
irq: add remove_irq() for freeing of setup_irq() irqs
genirq: assert that irq handlers are indeed running in hardirq context
irq: name 'p' variables a bit better
irq: further clean up the free_irq() code flow
irq: refactor and clean up the free_irq() code flow
irq: clean up manage.c
irq: use GFP_KERNEL for action allocation in request_irq()
kernel/irq: fix sparse warning: make symbol static
irq: optimize init_kstat_irqs/init_copy_kstat_irqs
... -
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
16 Mar, 2009
1 commit
13 Mar, 2009
1 commit
11 Mar, 2009
1 commit
-
* ->put_char changes
* HIGHMEM is bogus it seems, there is no kmap_atomic() et al
* some includesSigned-off-by: Alexey Dobriyan
Acked-by: Chris Zankel
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
06 Mar, 2009
1 commit
-
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.cSemantic conflict:
kernel/trace/blktrace.cSigned-off-by: Ingo Molnar
03 Mar, 2009
1 commit
-
The current definition of CALLER_ADDRx isn't suitable for all platforms.
E.g. for ARM __builtin_return_address(N) doesn't work for N > 0 and
AFAIK for powerpc there are no frame pointers needed to have a working
__builtin_return_address. This patch allows defining the CALLER_ADDRx
macros in and let these take precedence.Because now is included unconditionally in
all archs that don't already had this include get an
empty one for free.Signed-off-by: Uwe Kleine-Koenig
Cc: Peter Zijlstra
Cc: Ingo Molnar
Reviewed-by: KOSAKI Motohiro
Signed-off-by: Steven Rostedt
16 Feb, 2009
1 commit
-
User space can request hardware and/or software time stamping.
Reporting of the result(s) via a new control message is enabled
separately for each field in the message because some of the
fields may require additional computation and thus cause overhead.
User space can tell the different kinds of time stamps apart
and choose what suits its needs.When a TX timestamp operation is requested, the TX skb will be cloned
and the clone will be time stamped (in hardware or software) and added
to the socket error queue of the skb, if the skb has a socket
associated with it.The actual TX timestamp will reach userspace as a RX timestamp on the
cloned packet. If timestamping is requested and no timestamping is
done in the device driver (potentially this may use hardware
timestamping), it will be done in software after the device's
start_hard_xmit routine.Signed-off-by: Patrick Ohly
Signed-off-by: David S. Miller
13 Feb, 2009
1 commit
01 Feb, 2009
1 commit
-
fix the following 'make headers_check' warnings:
usr/include/asm-xtensa/swab.h:14: include of is preferred over
usr/include/asm-xtensa/swab.h:19: found __[us]{8,16,32,64} type without #includeSigned-off-by: Jaswinder Singh Rajput
15 Jan, 2009
1 commit
-
Add swab.h to kbuild.asm and remove the individual entries from
each arch, mark as unifdef as some arches have some kernel-only
bits inside.Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds
