Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 43487
b: refs/heads/master
c: aad0947
h: refs/heads/master
i:
  43485: 80f0497
  43483: d1b9b8c
  43479: cea1acc
  43471: 07d299f
  43455: 29dc026
v: v3
  • Loading branch information
Jan Beulich authored and Linus Torvalds committed Dec 8, 2006
1 parent e3719f7 commit 449134b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d93f7de8c5dfefb030a5e65d0857176879bf78e9
refs/heads/master: aad094701c6355cb2b3d74a07ec0496f4a48c787
16 changes: 8 additions & 8 deletions trunk/kernel/kallsyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
#endif

/* These will be re-linked against their real values during the second link stage */
extern unsigned long kallsyms_addresses[] __attribute__((weak));
extern unsigned long kallsyms_num_syms __attribute__((weak,section("data")));
extern u8 kallsyms_names[] __attribute__((weak));
extern const unsigned long kallsyms_addresses[] __attribute__((weak));
extern const unsigned long kallsyms_num_syms __attribute__((weak));
extern const u8 kallsyms_names[] __attribute__((weak));

extern u8 kallsyms_token_table[] __attribute__((weak));
extern u16 kallsyms_token_index[] __attribute__((weak));
extern const u8 kallsyms_token_table[] __attribute__((weak));
extern const u16 kallsyms_token_index[] __attribute__((weak));

extern unsigned long kallsyms_markers[] __attribute__((weak));
extern const unsigned long kallsyms_markers[] __attribute__((weak));

static inline int is_kernel_inittext(unsigned long addr)
{
Expand Down Expand Up @@ -84,7 +84,7 @@ static int is_ksym_addr(unsigned long addr)
static unsigned int kallsyms_expand_symbol(unsigned int off, char *result)
{
int len, skipped_first = 0;
u8 *tptr, *data;
const u8 *tptr, *data;

/* get the compressed symbol length from the first symbol byte */
data = &kallsyms_names[off];
Expand Down Expand Up @@ -132,7 +132,7 @@ static char kallsyms_get_symbol_type(unsigned int off)
* kallsyms array */
static unsigned int get_symbol_offset(unsigned long pos)
{
u8 *name;
const u8 *name;
int i;

/* use the closest marker we have. We have markers every 256 positions,
Expand Down
2 changes: 1 addition & 1 deletion trunk/scripts/kallsyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static void write_src(void)
printf("#define ALGN .align 4\n");
printf("#endif\n");

printf(".data\n");
printf("\t.section .rodata, \"a\"\n");

/* Provide proper symbols relocatability by their '_text'
* relativeness. The symbol names cannot be used to construct
Expand Down

0 comments on commit 449134b

Please sign in to comment.