litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Alon Bar-Lev <alon.barlev@gmail.com>	2007-02-12 03:54:14 -0500
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>	2007-02-12 12:48:38 -0500
commit	f2a09e19cae45b7dfa4b72d70182b5bc9afa2ddb (patch)
tree	324b516cfeab466b88cee8a7c3b1045cd5d98b69
parent	187959f31e92cde16b274f0b61dfaca3a8b14089 (diff)

[PATCH] Dynamic kernel command-line: m68knommu

1. Rename saved_command_line into boot_command_line. 2. Set command_line as __initdata. Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Cc: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Diffstat

-rw-r--r--

arch/m68knommu/kernel/setup.c

1 files changed, 3 insertions, 3 deletions


diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index 9cf2e4d1fc77..d5c25d27b64d 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c
@@ -44,7 +44,7 @@ unsigned long memory_end;
44	EXPORT_SYMBOL(memory_start);	44	EXPORT_SYMBOL(memory_start);
45	EXPORT_SYMBOL(memory_end);	45	EXPORT_SYMBOL(memory_end);
46		46
47	char command_line[COMMAND_LINE_SIZE];	47	char __initdata command_line[COMMAND_LINE_SIZE];
48		48
49	/* setup some dummy routines */	49	/* setup some dummy routines */
50	static void dummy_waitbut(void)	50	static void dummy_waitbut(void)
@@ -231,8 +231,8 @@ void setup_arch(char **cmdline_p)
231		231
232	/* Keep a copy of command line */	232	/* Keep a copy of command line */
233	*cmdline_p = &command_line[0];	233	*cmdline_p = &command_line[0];
234	memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);	234	memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
235	saved_command_line[COMMAND_LINE_SIZE-1] = 0;	235	boot_command_line[COMMAND_LINE_SIZE-1] = 0;
236		236
237	#ifdef DEBUG	237	#ifdef DEBUG
238	if (strlen(*cmdline_p))	238	if (strlen(*cmdline_p))

#ifndef __SOUND_PCM_OSS_H #define __SOUND_PCM_OSS_H /* * Digital Audio (PCM) - OSS compatibility abstract layer * Copyright (c) by Jaroslav Kysela <perex@perex.cz> * * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ struct snd_pcm_oss_setup { char *task_name; unsigned int disable:1, direct:1, block:1, nonblock:1, partialfrag:1, nosilence:1, buggyptr:1; unsigned int periods; unsigned int period_size; struct snd_pcm_oss_setup *next; }; struct snd_pcm_oss_runtime { unsigned params: 1, /* format/parameter change */ prepare: 1, /* need to prepare the operation */ trigger: 1, /* trigger flag */ sync_trigger: 1; /* sync trigger flag */ int rate; /* requested rate */ int format; /* requested OSS format */ unsigned int channels; /* requested channels */ unsigned int fragshift; unsigned int maxfrags; unsigned int subdivision; /* requested subdivision */ size_t period_bytes; /* requested period size */ size_t period_frames; /* period frames for poll */ size_t period_ptr; /* actual write pointer to period */ unsigned int periods; size_t buffer_bytes; /* requested buffer size */ size_t bytes; /* total # bytes processed */ size_t mmap_bytes; char *buffer; /* vmallocated period */ size_t buffer_used; /* used length from period buffer */ struct mutex params_lock; #ifdef CONFIG_SND_PCM_OSS_PLUGINS struct snd_pcm_plugin *plugin_first; struct snd_pcm_plugin *plugin_last; #endif unsigned int prev_hw_ptr_period; }; struct snd_pcm_oss_file { struct snd_pcm_substream *streams[2]; }; struct snd_pcm_oss_substream { unsigned oss: 1; /* oss mode */ struct snd_pcm_oss_setup setup; /* active setup */ }; struct snd_pcm_oss_stream { struct snd_pcm_oss_setup *setup_list; /* setup list */ struct mutex setup_mutex; #ifdef CONFIG_SND_VERBOSE_PROCFS struct snd_info_entry *proc_entry; #endif }; struct snd_pcm_oss { int reg; unsigned int reg_mask; }; #endif /* __SOUND_PCM_OSS_H */


context:
space:
mode: