Commit 77dd8f26 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents 52c785da d16bb53b
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#endif #endif
#ifdef CONFIG_SUN3X #ifdef CONFIG_SUN3X
#include <asm/dvma.h> #include <asm/dvma.h>
extern void sun_serial_setup(void);
#endif #endif
unsigned long m68k_machtype; unsigned long m68k_machtype;
......
...@@ -233,7 +233,6 @@ extern char cputypval; ...@@ -233,7 +233,6 @@ extern char cputypval;
extern unsigned long start, end; extern unsigned long start, end;
extern void panic_setup(char *, int *); extern void panic_setup(char *, int *);
extern void srmmu_end_memory(unsigned long, unsigned long *); extern void srmmu_end_memory(unsigned long, unsigned long *);
extern void sun_serial_setup(void);
extern unsigned short root_flags; extern unsigned short root_flags;
extern unsigned short root_dev; extern unsigned short root_dev;
......
...@@ -633,6 +633,15 @@ config DEBUG_KERNEL ...@@ -633,6 +633,15 @@ config DEBUG_KERNEL
Say Y here if you are developing drivers or trying to debug and Say Y here if you are developing drivers or trying to debug and
identify kernel problems. identify kernel problems.
config DEBUG_STACK_USAGE
bool "Enable stack utilization instrumentation"
depends on DEBUG_KERNEL
help
Enables the display of the minimum amount of free stack which each
task has ever had available in the sysrq-T and sysrq-P debug output.
This option will slow down process creation somewhat.
config DEBUG_SLAB config DEBUG_SLAB
bool "Debug memory allocations" bool "Debug memory allocations"
depends on DEBUG_KERNEL depends on DEBUG_KERNEL
......
...@@ -905,7 +905,6 @@ CONFIG_IRDA_FAST_RR=y ...@@ -905,7 +905,6 @@ CONFIG_IRDA_FAST_RR=y
# #
# Old SIR device drivers # Old SIR device drivers
# #
# CONFIG_IRPORT_SIR is not set
# #
# Old Serial dongle support # Old Serial dongle support
...@@ -1657,6 +1656,7 @@ CONFIG_OPROFILE=m ...@@ -1657,6 +1656,7 @@ CONFIG_OPROFILE=m
# Kernel hacking # Kernel hacking
# #
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SLAB is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
# CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK is not set
......
...@@ -1423,7 +1423,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) ...@@ -1423,7 +1423,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
/* paging_init() sets up the page tables */ /* paging_init() sets up the page tables */
extern void sun_serial_setup(void);
extern void cheetah_ecache_flush_init(void); extern void cheetah_ecache_flush_init(void);
static unsigned long last_valid_pfn; static unsigned long last_valid_pfn;
...@@ -1548,15 +1547,6 @@ void __init paging_init(void) ...@@ -1548,15 +1547,6 @@ void __init paging_init(void)
inherit_locked_prom_mappings(1); inherit_locked_prom_mappings(1);
#ifdef CONFIG_SUN_SERIAL
/* This does not logically belong here, but we need to call it at
* the moment we are able to use the bootmem allocator. This _has_
* to be done after the prom_mappings above so since
* __alloc_bootmem() doesn't work correctly until then.
*/
sun_serial_setup();
#endif
/* We only created DTLB mapping of this stuff. */ /* We only created DTLB mapping of this stuff. */
spitfire_flush_dtlb_nucleus_page(alias_base); spitfire_flush_dtlb_nucleus_page(alias_base);
if (second_alias_page) if (second_alias_page)
......
...@@ -142,13 +142,30 @@ register struct thread_info *current_thread_info_reg asm("g6"); ...@@ -142,13 +142,30 @@ register struct thread_info *current_thread_info_reg asm("g6");
/* thread information allocation */ /* thread information allocation */
#if PAGE_SHIFT == 13 #if PAGE_SHIFT == 13
#define alloc_thread_info(tsk)((struct thread_info *)__get_free_pages(GFP_KERNEL, 1)) #define __THREAD_INFO_ORDER 1
#define free_thread_info(ti) free_pages((unsigned long)(ti),1)
#else /* PAGE_SHIFT == 13 */ #else /* PAGE_SHIFT == 13 */
#define alloc_thread_info(tsk)((struct thread_info *)__get_free_pages(GFP_KERNEL, 0)) #define __THREAD_INFO_ORDER 0
#define free_thread_info(ti) free_pages((unsigned long)(ti),0)
#endif /* PAGE_SHIFT == 13 */ #endif /* PAGE_SHIFT == 13 */
#ifdef CONFIG_DEBUG_STACK_USAGE
#define alloc_thread_info(tsk) \
({ \
struct thread_info *ret; \
\
ret = (struct thread_info *) \
__get_free_pages(GFP_KERNEL, __THREAD_INFO_ORDER); \
if (ret) \
memset(ret, 0, PAGE_SIZE<<__THREAD_INFO_ORDER); \
ret; \
})
#else
#define alloc_thread_info(tsk) \
((struct thread_info *)__get_free_pages(GFP_KERNEL, __THREAD_INFO_ORDER))
#endif
#define free_thread_info(ti) \
free_pages((unsigned long)(ti),__THREAD_INFO_ORDER)
#define __thread_flag_byte_ptr(ti) \ #define __thread_flag_byte_ptr(ti) \
((unsigned char *)(&((ti)->flags))) ((unsigned char *)(&((ti)->flags)))
#define __cur_thread_flag_byte_ptr __thread_flag_byte_ptr(current_thread_info()) #define __cur_thread_flag_byte_ptr __thread_flag_byte_ptr(current_thread_info())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment