GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 05:31:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

Browse source 
* 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  module: drop the lock while waiting for module to complete initialization.
  MODULE_DEVICE_TABLE(isapnp, ...) does nothing
  hisax_fcpcipnp: fix broken isapnp device table.
  isapnp: move definitions to mod_devicetable.h so file2alias can reach them.
This commit is contained in:
Linus Torvalds 2010-05-21 17:15:44 -07:00
commit a8251096b4
5 changed files with 63 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scripts/mod/file2alias.c
View file

@ -828,6 +828,19 @@ static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
return 1;
}
/* looks like: "pnp:dD" */
static int do_isapnp_entry(const char *filename,
struct isapnp_device_id *id, char *alias)
{
sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
'A' + ((id->vendor >> 2) & 0x3f) - 1,
'A' + (((id->vendor & 3) << 3) | ((id->vendor >> 13) & 7)) - 1,
'A' + ((id->vendor >> 8) & 0x1f) - 1,
(id->function >> 4) & 0x0f, id->function & 0x0f,
(id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
return 1;
}
/* Ignore any prefix, eg. some architectures prepend _ */
static inline int sym_is(const char *symbol, const char *name)
{
@ -983,6 +996,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
do_table(symval, sym->st_size,
sizeof(struct zorro_device_id), "zorro",
do_zorro_entry, mod);
else if (sym_is(symname, "__mod_isapnp_device_table"))
do_table(symval, sym->st_size,
sizeof(struct isapnp_device_id), "isa",
do_isapnp_entry, mod);
free(zeros);
}