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.
This commit is contained in:
commit
ec2f9d1331
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
#ifndef _SPARC64_SETUP_H
|
||||
#define _SPARC64_SETUP_H
|
||||
|
||||
#define COMMAND_LINE_SIZE 256
|
||||
#define COMMAND_LINE_SIZE 2048
|
||||
|
||||
#endif /* _SPARC64_SETUP_H */
|
||||
|
|
Loading…
Reference in a new issue