xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
James Morris
2008-08-28 10:47:34 +10:00
parent 93c06cbbf9 4c246edd25
commit 86d688984d
4405 changed files with 100578 additions and 38118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Makefile.fwinst
View File

@@ -50,8 +50,12 @@ PHONY += __fw_install __fw_modinst FORCE
.PHONY: $(PHONY)
__fw_install: $(installed-fw)
__fw_modinst: $(installed-mod-fw)
@:
__fw_modbuild: $(addprefix $(obj)/,$(mod-fw))
@:
FORCE:

2
scripts/kconfig/conf.c
View File

@@ -596,7 +596,7 @@ int main(int ac, char **av)
break;
}
if (conf_get_changed() && conf_write(NULL)) {
if (conf_write(NULL)) {
fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
exit(1);
}

8
scripts/kconfig/confdata.c
View File

@@ -222,10 +222,8 @@ load:
continue;
if (def == S_DEF_USER) {
sym = sym_find(line + 9);
if (!sym) {
conf_warning("trying to assign nonexistent symbol %s", line + 9);
if (!sym)
break;
}
} else {
sym = sym_lookup(line + 9, 0);
if (sym->type == S_UNKNOWN)
@@ -261,10 +259,8 @@ load:
}
if (def == S_DEF_USER) {
sym = sym_find(line + 7);
if (!sym) {
conf_warning("trying to assign nonexistent symbol %s", line + 7);
if (!sym)
break;
}
} else {
sym = sym_lookup(line + 7, 0);
if (sym->type == S_UNKNOWN)

2
scripts/kernel-doc
View File

@@ -1403,7 +1403,7 @@ sub dump_struct($$) {
my $members = $3;
# ignore embedded structs or unions
$members =~ s/{.*?}//g;
$members =~ s/{.*}//g;
# ignore members marked private:
$members =~ s/\/\*.*?private:.*?public:.*?\*\///gos;

16
scripts/mod/file2alias.c
View File

@@ -344,14 +344,20 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
struct module *mod)
{
const unsigned long id_size = sizeof(struct pnp_device_id);
const struct pnp_device_id *id = symval;
const unsigned int count = (size / id_size)-1;
const struct pnp_device_id *devs = symval;
unsigned int i;
device_id_check(mod->name, "pnp", size, id_size, symval);
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"pnp:d%s*\");\n", id->id);
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id);
for (i = 0; i < count; i++) {
const char *id = (char *)devs[i].id;
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"pnp:d%s*\");\n", id);
buf_printf(&mod->dev_table_buf,
"MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
}
}
/* looks like: "pnp:dD" for every device of the card */

3
scripts/patch-kernel
View File

@@ -213,6 +213,7 @@ fi
if [ $stopvers != "default" ]; then
STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`
STOPEXTRA=`echo $stopvers | cut -d. -f4`
STOPFULLVERSION=${stopvers%%.$STOPEXTRA}
#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"
else
STOPSUBLEVEL=9999
@@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s)
do
CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
EXTRAVER=
if [ $stopvers = $CURRENTFULLVERSION ]; then
if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
echo "Stopping at $CURRENTFULLVERSION base as requested."
break
fi