aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-02 07:14:06 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-02 07:14:06 +0000
commitfa17c4b94951374c919c6a099db9dcfcc2487c19 (patch)
tree2c0d1f2a1e5072a0bb00f8be252a87561731804e
parent86a4bfb30a09dbcd524e5b3ea8029a2400b01276 (diff)
downloadbusybox-w32-fa17c4b94951374c919c6a099db9dcfcc2487c19.tar.gz
busybox-w32-fa17c4b94951374c919c6a099db9dcfcc2487c19.tar.bz2
busybox-w32-fa17c4b94951374c919c6a099db9dcfcc2487c19.zip
fixup whitespace
-rw-r--r--modutils/insmod.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 2560aee25..d35e08d4e 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -110,7 +110,7 @@ extern int insmod_ng_main( int argc, char **argv);
110 110
111 111
112/* Alpha */ 112/* Alpha */
113#if defined(__alpha__) 113#if defined(__alpha__)
114#define MATCH_MACHINE(x) (x == EM_ALPHA) 114#define MATCH_MACHINE(x) (x == EM_ALPHA)
115#define SHT_RELM SHT_RELA 115#define SHT_RELM SHT_RELA
116#define Elf64_RelM Elf64_Rela 116#define Elf64_RelM Elf64_Rela
@@ -843,7 +843,7 @@ arch_apply_relocation(struct obj_file *f,
843 struct obj_section *targsec, 843 struct obj_section *targsec,
844 struct obj_section *symsec, 844 struct obj_section *symsec,
845 struct obj_symbol *sym, 845 struct obj_symbol *sym,
846 ElfW(RelM) *rel, ElfW(Addr) v) 846 ElfW(RelM) *rel, ElfW(Addr) v)
847{ 847{
848 struct arch_file *ifile = (struct arch_file *) f; 848 struct arch_file *ifile = (struct arch_file *) f;
849 enum obj_reloc ret = obj_reloc_ok; 849 enum obj_reloc ret = obj_reloc_ok;
@@ -1384,31 +1384,31 @@ arch_apply_relocation(struct obj_file *f,
1384#endif 1384#endif
1385 1385
1386#if defined(__H8300H__) || defined(__H8300S__) 1386#if defined(__H8300H__) || defined(__H8300S__)
1387 case R_H8_DIR24R8: 1387 case R_H8_DIR24R8:
1388 loc = (ElfW(Addr) *)((ElfW(Addr))loc - 1); 1388 loc = (ElfW(Addr) *)((ElfW(Addr))loc - 1);
1389 *loc = (*loc & 0xff000000) | ((*loc & 0xffffff) + v); 1389 *loc = (*loc & 0xff000000) | ((*loc & 0xffffff) + v);
1390 break; 1390 break;
1391 case R_H8_DIR24A8: 1391 case R_H8_DIR24A8:
1392 *loc += v; 1392 *loc += v;
1393 break; 1393 break;
1394 case R_H8_DIR32: 1394 case R_H8_DIR32:
1395 case R_H8_DIR32A16: 1395 case R_H8_DIR32A16:
1396 *loc += v; 1396 *loc += v;
1397 break; 1397 break;
1398 case R_H8_PCREL16: 1398 case R_H8_PCREL16:
1399 v -= dot + 2; 1399 v -= dot + 2;
1400 if ((ElfW(Sword))v > 0x7fff || 1400 if ((ElfW(Sword))v > 0x7fff ||
1401 (ElfW(Sword))v < -(ElfW(Sword))0x8000) 1401 (ElfW(Sword))v < -(ElfW(Sword))0x8000)
1402 ret = obj_reloc_overflow; 1402 ret = obj_reloc_overflow;
1403 else 1403 else
1404 *(unsigned short *)loc = v; 1404 *(unsigned short *)loc = v;
1405 break; 1405 break;
1406 case R_H8_PCREL8: 1406 case R_H8_PCREL8:
1407 v -= dot + 1; 1407 v -= dot + 1;
1408 if ((ElfW(Sword))v > 0x7f || 1408 if ((ElfW(Sword))v > 0x7f ||
1409 (ElfW(Sword))v < -(ElfW(Sword))0x80) 1409 (ElfW(Sword))v < -(ElfW(Sword))0x80)
1410 ret = obj_reloc_overflow; 1410 ret = obj_reloc_overflow;
1411 else 1411 else
1412 *(unsigned char *)loc = v; 1412 *(unsigned char *)loc = v;
1413 break; 1413 break;
1414#endif 1414#endif
@@ -1439,7 +1439,7 @@ bb_use_plt:
1439#endif 1439#endif
1440#if defined(__powerpc__) 1440#if defined(__powerpc__)
1441 ip[0] = 0x3d600000 + ((v + 0x8000) >> 16); /* lis r11,sym@ha */ 1441 ip[0] = 0x3d600000 + ((v + 0x8000) >> 16); /* lis r11,sym@ha */
1442 ip[1] = 0x396b0000 + (v & 0xffff); /* addi r11,r11,sym@l */ 1442 ip[1] = 0x396b0000 + (v & 0xffff); /* addi r11,r11,sym@l */
1443 ip[2] = 0x7d6903a6; /* mtctr r11 */ 1443 ip[2] = 0x7d6903a6; /* mtctr r11 */
1444 ip[3] = 0x4e800420; /* bctr */ 1444 ip[3] = 0x4e800420; /* bctr */
1445#endif 1445#endif
@@ -3427,7 +3427,7 @@ static int obj_gpl_license(struct obj_file *f, const char **license)
3427#define TAINT_PROPRIETORY_MODULE (1<<0) 3427#define TAINT_PROPRIETORY_MODULE (1<<0)
3428#define TAINT_FORCED_MODULE (1<<1) 3428#define TAINT_FORCED_MODULE (1<<1)
3429#define TAINT_UNSAFE_SMP (1<<2) 3429#define TAINT_UNSAFE_SMP (1<<2)
3430#define TAINT_URL "http://www.tux.org/lkml/#export-tainted" 3430#define TAINT_URL "http://www.tux.org/lkml/#export-tainted"
3431 3431
3432static void set_tainted(struct obj_file *f, int fd, char *m_name, 3432static void set_tainted(struct obj_file *f, int fd, char *m_name,
3433 int kernel_has_tainted, int taint, const char *text1, const char *text2) 3433 int kernel_has_tainted, int taint, const char *text1, const char *text2)