Index: linux-2.6.15/include/asm-arm/ltt/ltt-facility-id-kernel_arch_arm.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/include/asm-arm/ltt/ltt-facility-id-kernel_arch_arm.h 2006-01-27 15:06:34.000000000 +0000 @@ -0,0 +1,22 @@ +#ifndef _LTT_FACILITY_ID_KERNEL_ARCH_H_ +#define _LTT_FACILITY_ID_KERNEL_ARCH_H_ + +#ifdef CONFIG_LTT +#include + +/**** facility handle ****/ + +extern ltt_facility_t ltt_facility_kernel_arch_62B14C1E; +extern ltt_facility_t ltt_facility_kernel_arch; + + +/**** event index ****/ + +enum kernel_arch_event { + event_kernel_arch_syscall_entry, + event_kernel_arch_syscall_exit, + facility_kernel_arch_num_events +}; + +#endif //CONFIG_LTT +#endif //_LTT_FACILITY_ID_KERNEL_ARCH_H_ Index: linux-2.6.15/arch/arm/kernel/process.c =================================================================== --- linux-2.6.15.orig/arch/arm/kernel/process.c 2006-01-26 10:40:10.856963824 +0000 +++ linux-2.6.15/arch/arm/kernel/process.c 2006-01-26 10:40:33.699491232 +0000 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -454,7 +454,7 @@ pid = do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, ®s, 0, NULL, NULL); #if (CONFIG_LTT) if(pid >= 0) - ltt_ev_process(LTT_EV_PROCESS_KTHREAD, pid, (int) fn); + trace_process_kernel_thread(pid, fn); #endif return pid; } Index: linux-2.6.15/arch/arm/kernel/irq.c =================================================================== --- linux-2.6.15.orig/arch/arm/kernel/irq.c 2006-01-26 10:40:10.855963976 +0000 +++ linux-2.6.15/arch/arm/kernel/irq.c 2006-01-26 10:40:34.036440008 +0000 @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include @@ -538,7 +538,7 @@ { struct irqdesc *desc = irq_desc + irq; - ltt_ev_irq_entry(irq, !(user_mode(regs))); + trace_kernel_irq_entry(irq, !(user_mode(regs))); /* * Some hardware gives randomly wrong interrupts. Rather @@ -562,7 +562,7 @@ spin_unlock(&irq_controller_lock); irq_exit(); - ltt_ev_irq_exit(); + trace_kernel_irq_exit(); } void __set_irq_handler(unsigned int irq, irq_handler_t handle, int is_chained) Index: linux-2.6.15/include/asm-arm/ltt/ltt-facility-kernel_arch_arm.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/include/asm-arm/ltt/ltt-facility-kernel_arch_arm.h 2006-01-27 15:06:34.000000000 +0000 @@ -0,0 +1,504 @@ +#ifndef _LTT_FACILITY_KERNEL_ARCH_H_ +#define _LTT_FACILITY_KERNEL_ARCH_H_ + +#include +#include +#include + +/* Named types */ + +enum lttng_syscall_name { + LTTNG_restart_syscall = 0, + LTTNG_exit = 1, + LTTNG_fork = 2, + LTTNG_read = 3, + LTTNG_write = 4, + LTTNG_open = 5, + LTTNG_close = 6, + LTTNG_waitpid = 7, + LTTNG_creat = 8, + LTTNG_link = 9, + LTTNG_unlink = 10, + LTTNG_execve = 11, + LTTNG_chdir = 12, + LTTNG_time = 13, + LTTNG_mknod = 14, + LTTNG_chmod = 15, + LTTNG_lchown = 16, + LTTNG_break = 17, + LTTNG_oldstat = 18, + LTTNG_lseek = 19, + LTTNG_getpid = 20, + LTTNG_mount = 21, + LTTNG_umount = 22, + LTTNG_setuid = 23, + LTTNG_getuid = 24, + LTTNG_stime = 25, + LTTNG_ptrace = 26, + LTTNG_alarm = 27, + LTTNG_oldfstat = 28, + LTTNG_pause = 29, + LTTNG_utime = 30, + LTTNG_stty = 31, + LTTNG_gtty = 32, + LTTNG_access = 33, + LTTNG_nice = 34, + LTTNG_ftime = 35, + LTTNG_sync = 36, + LTTNG_kill = 37, + LTTNG_rename = 38, + LTTNG_mkdir = 39, + LTTNG_rmdir = 40, + LTTNG_dup = 41, + LTTNG_pipe = 42, + LTTNG_times = 43, + LTTNG_prof = 44, + LTTNG_brk = 45, + LTTNG_setgid = 46, + LTTNG_getgid = 47, + LTTNG_signal = 48, + LTTNG_geteuid = 49, + LTTNG_getegid = 50, + LTTNG_acct = 51, + LTTNG_umount2 = 52, + LTTNG_lock = 53, + LTTNG_ioctl = 54, + LTTNG_fcntl = 55, + LTTNG_mpx = 56, + LTTNG_setpgid = 57, + LTTNG_ulimit = 58, + LTTNG_oldolduname = 59, + LTTNG_umask = 60, + LTTNG_chroot = 61, + LTTNG_ustat = 62, + LTTNG_dup2 = 63, + LTTNG_getppid = 64, + LTTNG_getpgrp = 65, + LTTNG_setsid = 66, + LTTNG_sigaction = 67, + LTTNG_sgetmask = 68, + LTTNG_ssetmask = 69, + LTTNG_setreuid = 70, + LTTNG_setregid = 71, + LTTNG_sigsuspend = 72, + LTTNG_sigpending = 73, + LTTNG_sethostname = 74, + LTTNG_setrlimit = 75, + LTTNG_getrlimit = 76, + LTTNG_getrusage = 77, + LTTNG_gettimeofday = 78, + LTTNG_settimeofday = 79, + LTTNG_getgroups = 80, + LTTNG_setgroups = 81, + LTTNG_select = 82, + LTTNG_symlink = 83, + LTTNG_oldlstat = 84, + LTTNG_readlink = 85, + LTTNG_uselib = 86, + LTTNG_swapon = 87, + LTTNG_reboot = 88, + LTTNG_readdir = 89, + LTTNG_mmap = 90, + LTTNG_munmap = 91, + LTTNG_truncate = 92, + LTTNG_ftruncate = 93, + LTTNG_fchmod = 94, + LTTNG_fchown = 95, + LTTNG_getpriority = 96, + LTTNG_setpriority = 97, + LTTNG_profil = 98, + LTTNG_statfs = 99, + LTTNG_fstatfs = 100, + LTTNG_ioperm = 101, + LTTNG_socketcall = 102, + LTTNG_syslog = 103, + LTTNG_setitimer = 104, + LTTNG_getitimer = 105, + LTTNG_stat = 106, + LTTNG_lstat = 107, + LTTNG_fstat = 108, + LTTNG_olduname = 109, + LTTNG_iopl = 110, + LTTNG_vhangup = 111, + LTTNG_idle = 112, + LTTNG_vm86old = 113, + LTTNG_wait4 = 114, + LTTNG_swapoff = 115, + LTTNG_sysinfo = 116, + LTTNG_ipc = 117, + LTTNG_fsync = 118, + LTTNG_sigreturn = 119, + LTTNG_clone = 120, + LTTNG_setdomainname = 121, + LTTNG_uname = 122, + LTTNG_modify_ldt = 123, + LTTNG_adjtimex = 124, + LTTNG_mprotect = 125, + LTTNG_sigprocmask = 126, + LTTNG_create_module = 127, + LTTNG_init_module = 128, + LTTNG_delete_module = 129, + LTTNG_get_kernel_syms = 130, + LTTNG_quotactl = 131, + LTTNG_getpgid = 132, + LTTNG_fchdir = 133, + LTTNG_bdflush = 134, + LTTNG_sysfs = 135, + LTTNG_personality = 136, + LTTNG_afs_syscall = 137, + LTTNG_setfsuid = 138, + LTTNG_setfsgid = 139, + LTTNG__llseek = 140, + LTTNG_getdents = 141, + LTTNG__newselect = 142, + LTTNG_flock = 143, + LTTNG_msync = 144, + LTTNG_readv = 145, + LTTNG_writev = 146, + LTTNG_getsid = 147, + LTTNG_fdatasync = 148, + LTTNG__sysctl = 149, + LTTNG_mlock = 150, + LTTNG_munlock = 151, + LTTNG_mlockall = 152, + LTTNG_munlockall = 153, + LTTNG_sched_setparam = 154, + LTTNG_sched_getparam = 155, + LTTNG_sched_setscheduler = 156, + LTTNG_sched_getscheduler = 157, + LTTNG_sched_yield = 158, + LTTNG_sched_get_priority_max = 159, + LTTNG_sched_get_priority_min = 160, + LTTNG_sched_rr_get_interval = 161, + LTTNG_nanosleep = 162, + LTTNG_mremap = 163, + LTTNG_setresuid = 164, + LTTNG_getresuid = 165, + LTTNG_vm86 = 166, + LTTNG_query_module = 167, + LTTNG_poll = 168, + LTTNG_nfsservctl = 169, + LTTNG_setresgid = 170, + LTTNG_getresgid = 171, + LTTNG_prctl = 172, + LTTNG_rt_sigreturn = 173, + LTTNG_rt_sigaction = 174, + LTTNG_rt_sigprocmask = 175, + LTTNG_rt_sigpending = 176, + LTTNG_rt_sigtimedwait = 177, + LTTNG_rt_sigqueueinfo = 178, + LTTNG_rt_sigsuspend = 179, + LTTNG_pread64 = 180, + LTTNG_pwrite64 = 181, + LTTNG_chown = 182, + LTTNG_getcwd = 183, + LTTNG_capget = 184, + LTTNG_capset = 185, + LTTNG_sigaltstack = 186, + LTTNG_sendfile = 187, + LTTNG_reserved1 = 188, + LTTNG_reserved2 = 189, + LTTNG_vfork = 190, + LTTNG_ugetrlimit = 191, + LTTNG_mmap2 = 192, + LTTNG_truncate64 = 193, + LTTNG_ftruncate64 = 194, + LTTNG_stat64 = 195, + LTTNG_lstat64 = 196, + LTTNG_fstat64 = 197, + LTTNG_lchown32 = 198, + LTTNG_getuid32 = 199, + LTTNG_getgid32 = 200, + LTTNG_geteuid32 = 201, + LTTNG_getegid32 = 202, + LTTNG_setreuid32 = 203, + LTTNG_setregid32 = 204, + LTTNG_getgroups32 = 205, + LTTNG_setgroups32 = 206, + LTTNG_fchown32 = 207, + LTTNG_setresuid32 = 208, + LTTNG_getresuid32 = 209, + LTTNG_setresgid32 = 210, + LTTNG_getresgid32 = 211, + LTTNG_chown32 = 212, + LTTNG_setuid32 = 213, + LTTNG_setgid32 = 214, + LTTNG_setfsuid32 = 215, + LTTNG_setfsgid32 = 216, + LTTNG_getdents64 = 217, + LTTNG_pivot_root = 218, + LTTNG_mincore = 219, + LTTNG_madvise = 220, + LTTNG_fcntl64 = 221, + LTTNG_tux = 222, + LTTNG_unsued = 223, + LTTNG_gettid = 224, + LTTNG_readahead = 225, + LTTNG_setxattr = 226, + LTTNG_lsetxattr = 227, + LTTNG_fsetxattr = 228, + LTTNG_getxattr = 229, + LTTNG_lgetxattr = 230, + LTTNG_fgetxattr = 231, + LTTNG_listxattr = 232, + LTTNG_llistxattr = 233, + LTTNG_flistxattr = 234, + LTTNG_removexattr = 235, + LTTNG_lremovexattr = 236, + LTTNG_fremovexattr = 237, + LTTNG_tkill = 238, + LTTNG_sendfile64 = 239, + LTTNG_futex = 240, + LTTNG_sched_setaffinity = 241, + LTTNG_sched_getaffinity = 242, + LTTNG_io_setup = 243, + LTTNG_io_destroy = 244, + LTTNG_io_getevents = 245, + LTTNG_io_submit = 246, + LTTNG_io_cancel = 247, + LTTNG_exit_group = 248, + LTTNG_lookup_dcookie = 249, + LTTNG_epoll_create = 250, + LTTNG_epoll_ctl = 251, + LTTNG_epoll_wait = 252, + LTTNG_remap_file_pages = 253, + LTTNG_set_thread_area = 254, + LTTNG_get_thread_area = 255, + LTTNG_set_tid_address = 256, + LTTNG_timer_create = 257, + LTTNG_timer_settime = 258, + LTTNG_timer_gettime = 259, + LTTNG_timer_getoverrun = 260, + LTTNG_timer_delete = 261, + LTTNG_clock_settime = 262, + LTTNG_clock_gettime = 263, + LTTNG_clock_getres = 264, + LTTNG_clock_nanosleep = 265, + LTTNG_statfs64 = 266, + LTTNG_fstatfs64 = 267, + LTTNG_tgkill = 268, + LTTNG_utimes = 269, + LTTNG_arm_fadvise64_64 = 270, + LTTNG_pciconfig_iobase = 271, + LTTNG_pciconfig_read = 272, + LTTNG_pciconfig_write = 273, + LTTNG_mq_open = 274, + LTTNG_mq_unlink = 275, + LTTNG_mq_timedsend = 276, + LTTNG_mq_timedreceive = 277, + LTTNG_mq_notify = 278, + LTTNG_mq_getsetattr = 279, + LTTNG_waitid = 280, + LTTNG_add_key = 309, + LTTNG_request_key = 310, + LTTNG_keyctl = 311, + LTTNG_vserver = 313, + LTTNG_ioprio_set = 314, + LTTNG_ioprio_get = 315, + LTTNG_inotify_init = 316, + LTTNG_inotify_add_watch = 317, + LTTNG_inotify_rm_watch = 318, + LTTNG_mbind = 319, + LTTNG_get_mempolicy = 320, + LTTNG_set_mempolicy = 321, +}; + +/* Event syscall_entry structures */ + +/* Event syscall_entry logging function */ +static inline void trace_kernel_arch_syscall_entry( + enum lttng_syscall_name lttng_param_syscall_id, + const void * lttng_param_address) +#if (!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_KERNEL_ARCH)) +{ +} +#else +{ + unsigned int index; + struct ltt_channel_struct *channel; + struct ltt_trace_struct *trace; + struct rchan_buf *relayfs_buf; + void *buffer = NULL; + size_t real_to_base = 0; /* The buffer is allocated on arch_size alignment */ + size_t *to_base = &real_to_base; + size_t real_to = 0; + size_t *to = &real_to; + size_t real_len = 0; + size_t *len = &real_len; + size_t reserve_size; + size_t slot_size; + size_t align; + const void *real_from; + const void **from = &real_from; + cycles_t tsc; + size_t before_hdr_pad, after_hdr_pad, header_size; + + if(ltt_traces.num_active_traces == 0) return; + + /* For each field, calculate the field size. */ + /* size = *to_base + *to + *len */ + /* Assume that the padding for alignment starts at a + * sizeof(void *) address. */ + + *from = <tng_param_syscall_id; + align = sizeof(enum lttng_syscall_name); + + if(*len == 0) { + *to += ltt_align(*to, align); /* align output */ + } else { + *len += ltt_align(*to+*len, align); /* alignment, ok to do a memcpy of it */ + } + + *len += sizeof(enum lttng_syscall_name); + + *from = <tng_param_address; + align = sizeof(const void *); + + if(*len == 0) { + *to += ltt_align(*to, align); /* align output */ + } else { + *len += ltt_align(*to+*len, align); /* alignment, ok to do a memcpy of it */ + } + + *len += sizeof(const void *); + + reserve_size = *to_base + *to + *len; + preempt_disable(); + ltt_nesting[smp_processor_id()]++; + index = ltt_get_index_from_facility(ltt_facility_kernel_arch_62B14C1E, + event_kernel_arch_syscall_entry); + + list_for_each_entry_rcu(trace, <t_traces.head, list) { + if(!trace->active) continue; + + channel = ltt_get_channel_from_index(trace, index); + relayfs_buf = channel->rchan->buf[smp_processor_id()]; + + slot_size = 0; + buffer = ltt_reserve_slot(trace, relayfs_buf, + reserve_size, &slot_size, &tsc, + &before_hdr_pad, &after_hdr_pad, &header_size); + if(!buffer) continue; /* buffer full */ + + *to_base = *to = *len = 0; + + ltt_write_event_header(trace, channel, buffer, + ltt_facility_kernel_arch_62B14C1E, event_kernel_arch_syscall_entry, + reserve_size, before_hdr_pad, tsc); + *to_base += before_hdr_pad + after_hdr_pad + header_size; + + *from = <tng_param_syscall_id; + align = sizeof(enum lttng_syscall_name); + + if(*len == 0) { + *to += ltt_align(*to, align); /* align output */ + } else { + *len += ltt_align(*to+*len, align); /* alignment, ok to do a memcpy of it */ + } + + *len += sizeof(enum lttng_syscall_name); + + /* Flush pending memcpy */ + if(*len != 0) { + memcpy(buffer+*to_base+*to, *from, *len); + *to += *len; + *len = 0; + } + + *from = <tng_param_address; + align = sizeof(const void *); + + if(*len == 0) { + *to += ltt_align(*to, align); /* align output */ + } else { + *len += ltt_align(*to+*len, align); /* alignment, ok to do a memcpy of it */ + } + + *len += sizeof(const void *); + + /* Flush pending memcpy */ + if(*len != 0) { + memcpy(buffer+*to_base+*to, *from, *len); + *to += *len; + *len = 0; + } + + ltt_commit_slot(relayfs_buf, buffer, slot_size); + + } + + ltt_nesting[smp_processor_id()]--; + preempt_enable_no_resched(); +} +#endif //(!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_KERNEL_ARCH)) + + +/* Event syscall_exit structures */ + +/* Event syscall_exit logging function */ +static inline void trace_kernel_arch_syscall_exit( + void) +#if (!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_KERNEL_ARCH)) +{ +} +#else +{ + unsigned int index; + struct ltt_channel_struct *channel; + struct ltt_trace_struct *trace; + struct rchan_buf *relayfs_buf; + void *buffer = NULL; + size_t real_to_base = 0; /* The buffer is allocated on arch_size alignment */ + size_t *to_base = &real_to_base; + size_t real_to = 0; + size_t *to = &real_to; + size_t real_len = 0; + size_t *len = &real_len; + size_t reserve_size; + size_t slot_size; + cycles_t tsc; + size_t before_hdr_pad, after_hdr_pad, header_size; + + if(ltt_traces.num_active_traces == 0) return; + + /* For each field, calculate the field size. */ + /* size = *to_base + *to + *len */ + /* Assume that the padding for alignment starts at a + * sizeof(void *) address. */ + + reserve_size = *to_base + *to + *len; + preempt_disable(); + ltt_nesting[smp_processor_id()]++; + index = ltt_get_index_from_facility(ltt_facility_kernel_arch_62B14C1E, + event_kernel_arch_syscall_exit); + + list_for_each_entry_rcu(trace, <t_traces.head, list) { + if(!trace->active) continue; + + channel = ltt_get_channel_from_index(trace, index); + relayfs_buf = channel->rchan->buf[smp_processor_id()]; + + slot_size = 0; + buffer = ltt_reserve_slot(trace, relayfs_buf, + reserve_size, &slot_size, &tsc, + &before_hdr_pad, &after_hdr_pad, &header_size); + if(!buffer) continue; /* buffer full */ + + *to_base = *to = *len = 0; + + ltt_write_event_header(trace, channel, buffer, + ltt_facility_kernel_arch_62B14C1E, event_kernel_arch_syscall_exit, + reserve_size, before_hdr_pad, tsc); + *to_base += before_hdr_pad + after_hdr_pad + header_size; + + ltt_commit_slot(relayfs_buf, buffer, slot_size); + + } + + ltt_nesting[smp_processor_id()]--; + preempt_enable_no_resched(); +} +#endif //(!defined(CONFIG_LTT) || !defined(CONFIG_LTT_FACILITY_KERNEL_ARCH)) + + +#endif //_LTT_FACILITY_KERNEL_ARCH_H_ Index: linux-2.6.15/arch/arm/kernel/sys_arm.c =================================================================== --- linux-2.6.15.orig/arch/arm/kernel/sys_arm.c 2006-01-26 10:40:10.857963672 +0000 +++ linux-2.6.15/arch/arm/kernel/sys_arm.c 2006-01-26 10:40:34.048438184 +0000 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -161,7 +161,7 @@ version = call >> 16; /* hack for backward compatibility */ call &= 0xffff; - ltt_ev_ipc(LTT_EV_IPC_CALL, call, first); + trace_ipc_call(call, first); switch (call) { case SEMOP: Index: linux-2.6.15/include/asm-arm/ltt.h =================================================================== --- linux-2.6.15.orig/include/asm-arm/ltt.h 2006-01-26 10:40:07.811426816 +0000 +++ linux-2.6.15/include/asm-arm/ltt.h 2006-01-30 11:57:23.080572840 +0000 @@ -53,5 +53,9 @@ return 1; } +#define LTT_ARCH_TYPE LTT_ARCH_TYPE_ARM +#define LTT_ARCH_VARIANT LTT_ARCH_VARIANT_NONE +#undef LTT_HAS_TSC + #endif Index: linux-2.6.15/arch/arm/kernel/traps.c =================================================================== --- linux-2.6.15.orig/arch/arm/kernel/traps.c 2006-01-26 10:40:10.858963520 +0000 +++ linux-2.6.15/arch/arm/kernel/traps.c 2006-01-26 10:40:34.050437880 +0000 @@ -20,7 +20,9 @@ #include #include #include -#include +#include +#include +#include #include #include @@ -200,65 +202,16 @@ } #if (CONFIG_LTT) -asmlinkage void trace_real_syscall_entry(int scno,struct pt_regs * regs) +asmlinkage void trace_real_syscall_entry(int scno, struct pt_regs * regs) { - int depth = 0; - unsigned long end_code; - unsigned long *fp; /* frame pointer */ - unsigned long lower_bound; - unsigned long lr; /* link register */ - unsigned long *prev_fp; - int seek_depth; - unsigned long start_code; - unsigned long *start_stack; - ltt_syscall_entry trace_syscall_event; - unsigned long upper_bound; - int use_bounds; - int use_depth; - - trace_syscall_event.syscall_id = (uint8_t)scno; - trace_syscall_event.address = instruction_pointer(regs); - - if (! (user_mode(regs) )) - goto trace_syscall_end; - - if (ltt_get_trace_config(&use_depth, &use_bounds, &seek_depth, - (void*)&lower_bound, (void*)&upper_bound) < 0) - goto trace_syscall_end; - - if ((use_depth == 1) || (use_bounds == 1)) { - fp = (unsigned long *)regs->ARM_fp; - end_code = current->mm->end_code; - start_code = current->mm->start_code; - start_stack = (unsigned long *)current->mm->start_stack; - - while (!__get_user(lr, (unsigned long *)(fp - 1))) { - if ((lr > start_code) && (lr < end_code)) { - if (((use_depth == 1) && (depth >= seek_depth)) || - ((use_bounds == 1) && (lr > lower_bound) && (lr < upper_bound))) { - trace_syscall_event.address = lr; - goto trace_syscall_end; - } else { - depth++; - } - } + void *address = (void *) instruction_pointer(regs); - if ((__get_user((unsigned long)prev_fp, (fp - 3))) || - (prev_fp > start_stack) || - (prev_fp <= fp)) { - goto trace_syscall_end; - } - fp = prev_fp; - } - } - -trace_syscall_end: - ltt_log_event(LTT_EV_SYSCALL_ENTRY, &trace_syscall_event); + trace_kernel_arch_syscall_entry((enum lttng_syscall_name)scno, address); } asmlinkage void trace_real_syscall_exit(void) { - ltt_log_event(LTT_EV_SYSCALL_EXIT, NULL); + trace_kernel_arch_syscall_exit(); } #endif /* (CONFIG_LTT) */ @@ -305,12 +258,12 @@ if (user_mode(regs)) { current->thread.error_code = err; current->thread.trap_no = trap; - - ltt_ev_trap_entry(current->thread.trap_no, (uint32_t)info->si_addr); + + trace_kernel_trap_entry(current->thread.trap_no, (void*)info->si_addr); force_sig_info(info->si_signo, info, current); - ltt_ev_trap_exit(); + trace_kernel_trap_exit(); } else { die(str, regs, err); Index: linux-2.6.15/arch/arm/Kconfig =================================================================== --- linux-2.6.15.orig/arch/arm/Kconfig 2006-01-26 10:40:25.148791136 +0000 +++ linux-2.6.15/arch/arm/Kconfig 2006-01-26 10:40:34.051437728 +0000 @@ -766,6 +766,8 @@ source "arch/arm/oprofile/Kconfig" +source "ltt/Kconfig" + source "arch/arm/Kconfig.debug" source "security/Kconfig" Index: linux-2.6.15/kernel/ltt-core.c =================================================================== --- linux-2.6.15.orig/kernel/ltt-core.c 2006-01-26 10:40:07.890414808 +0000 +++ linux-2.6.15/kernel/ltt-core.c 2006-01-30 11:57:22.989586672 +0000 @@ -66,7 +66,6 @@ #include #include #include -#include #include static struct dentry *ltt_root_dentry; Index: linux-2.6.15/ltt/ltt-facility-loader-kernel_arch_arm.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/ltt/ltt-facility-loader-kernel_arch_arm.c 2006-01-27 15:06:34.000000000 +0000 @@ -0,0 +1,86 @@ +/* + * ltt-facility-loader-kernel_arch_arm.c + * + * (C) Copyright 2005 - + * Mathieu Desnoyers (mathieu.desnoyers@polymtl.ca) + * + * Contains the LTT facility loader. + * + */ + + +#include +#include +#include +#include +#include "ltt-facility-loader-kernel_arch_arm.h" + + +#ifdef CONFIG_LTT + +EXPORT_SYMBOL(LTT_FACILITY_SYMBOL); +EXPORT_SYMBOL(LTT_FACILITY_CHECKSUM_SYMBOL); + +static const char ltt_facility_name[] = LTT_FACILITY_NAME; + +#define SYMBOL_STRING(sym) #sym + +static struct ltt_facility facility = { + .name = ltt_facility_name, + .num_events = LTT_FACILITY_NUM_EVENTS, + .checksum = LTT_FACILITY_CHECKSUM, + .symbol = SYMBOL_STRING(LTT_FACILITY_SYMBOL), +}; + +#ifndef MODULE + +/* Built-in facility. */ + +static int __init facility_init(void) +{ + printk(KERN_INFO "LTT : ltt-facility-kernel_arch init in kernel\n"); + + LTT_FACILITY_SYMBOL = ltt_facility_builtin_register(&facility); + LTT_FACILITY_CHECKSUM_SYMBOL = LTT_FACILITY_SYMBOL; + + return LTT_FACILITY_SYMBOL; +} +__initcall(facility_init); + + + +#else + +/* Dynamic facility. */ + +static int __init facility_init(void) +{ + printk(KERN_INFO "LTT : ltt-facility-kernel_arch init dynamic\n"); + + LTT_FACILITY_SYMBOL = ltt_facility_dynamic_register(&facility); + LTT_FACILITY_CHECKSUM_SYMBOL = LTT_FACILITY_SYMBOL; + + return LTT_FACILITY_SYMBOL; +} + +static void __exit facility_exit(void) +{ + int err; + + err = ltt_facility_dynamic_unregister(LTT_FACILITY_SYMBOL); + if(err != 0) + printk(KERN_ERR "LTT : Error in unregistering facility.\n"); + +} + +module_init(facility_init) +module_exit(facility_exit) + + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Mathieu Desnoyers"); +MODULE_DESCRIPTION("Linux Trace Toolkit Facility"); + +#endif //MODULE + +#endif //CONFIG_LTT Index: linux-2.6.15/ltt/ltt-facility-loader-kernel_arch_arm.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15/ltt/ltt-facility-loader-kernel_arch_arm.h 2006-01-27 15:06:34.000000000 +0000 @@ -0,0 +1,20 @@ +#ifndef _LTT_FACILITY_LOADER_KERNEL_ARCH_H_ +#define _LTT_FACILITY_LOADER_KERNEL_ARCH_H_ + +#ifdef CONFIG_LTT + +#include +#include + +ltt_facility_t ltt_facility_kernel_arch; +ltt_facility_t ltt_facility_kernel_arch_62B14C1E; + +#define LTT_FACILITY_SYMBOL ltt_facility_kernel_arch +#define LTT_FACILITY_CHECKSUM_SYMBOL ltt_facility_kernel_arch_62B14C1E +#define LTT_FACILITY_CHECKSUM 0x62B14C1E +#define LTT_FACILITY_NAME "kernel_arch" +#define LTT_FACILITY_NUM_EVENTS facility_kernel_arch_num_events + +#endif //CONFIG_LTT + +#endif //_LTT_FACILITY_LOADER_KERNEL_ARCH_H_