Commit ec2f9d13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Re-export saved_command_line to modules.
  [SPARC64]: Increase command line size to 2048 like other arches.
  [SPARC64]: We do not need ZONE_DMA.
parents 89697f1d 34cc560e

arch/sparc/kernel/sparc_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ EXPORT_SYMBOL(prom_getproplen); 
EXPORT_SYMBOL(prom_getproperty);

EXPORT_SYMBOL(prom_node_has_property);

EXPORT_SYMBOL(prom_setprop);

EXPORT_SYMBOL(boot_command_line);

EXPORT_SYMBOL(saved_command_line);

EXPORT_SYMBOL(prom_apply_obio_ranges);

EXPORT_SYMBOL(prom_feval);

EXPORT_SYMBOL(prom_getbool);

arch/sparc64/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -232,14 +232,6 @@ config LARGE_ALLOCS 


source "mm/Kconfig"



config ZONE_DMA

	bool

	default y



config GENERIC_ISA_DMA

	bool

	default y



config ISA

	bool

	help

arch/sparc64/defconfig

+8 −5
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.20

# Sat Feb 10 23:08:12 2007

# Sun Feb 11 23:47:40 2007

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -49,7 +49,6 @@ CONFIG_POSIX_MQUEUE=y 
# CONFIG_IKCONFIG is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_RELAY=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set
@@ -144,7 +143,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y 
CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_RESOURCES_64BIT=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_ZONE_DMA_FLAG=0

CONFIG_SBUS=y

CONFIG_SBUSCHAR=y

CONFIG_SUN_AUXIO=y
@@ -1259,6 +1258,10 @@ CONFIG_USB_HIDDEV=y 
# DMA Devices

#



#

# Auxiliary Display support

#



#

# Virtualization

#
@@ -1450,7 +1453,6 @@ CONFIG_SCHEDSTATS=y 
# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

# CONFIG_DEBUG_MUTEXES is not set

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_LOCK_ALLOC is not set

# CONFIG_PROVE_LOCKING is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -1533,4 +1535,5 @@ CONFIG_LIBCRC32C=m 
CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_IOMAP_COPY=y
 
CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

arch/sparc64/kernel/sparc64_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ EXPORT_SYMBOL(prom_getproplen); 
EXPORT_SYMBOL(prom_getproperty);

EXPORT_SYMBOL(prom_node_has_property);

EXPORT_SYMBOL(prom_setprop);

EXPORT_SYMBOL(boot_command_line);

EXPORT_SYMBOL(saved_command_line);

EXPORT_SYMBOL(prom_finddevice);

EXPORT_SYMBOL(prom_feval);

EXPORT_SYMBOL(prom_getbool);

arch/sparc64/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -1467,8 +1467,8 @@ void __init paging_init(void) 
		for (znum = 0; znum < MAX_NR_ZONES; znum++)

			zones_size[znum] = zholes_size[znum] = 0;



		zones_size[ZONE_DMA] = end_pfn;

		zholes_size[ZONE_DMA] = end_pfn - pages_avail;

		zones_size[ZONE_NORMAL] = end_pfn;

		zholes_size[ZONE_NORMAL] = end_pfn - pages_avail;



		free_area_init_node(0, &contig_page_data, zones_size,

				    __pa(PAGE_OFFSET) >> PAGE_SHIFT,

CRA Git | Maintained and supported by SUSTech CRA and CCSE