← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/linux/shared/compat_timer.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/shared/compat_timer.h
99
99
#   define compat_init_timer_deferrable(timer) init_timer(timer)
100
100
#endif
101
101
 
 
102
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
 
103
static inline void compat_setup_timer(struct timer_list * timer,
 
104
                                      void (*function)(unsigned long),
 
105
                                      unsigned long data)
 
106
{
 
107
   timer->function = function;
 
108
   timer->data = data;
 
109
   init_timer(timer);
 
110
}
 
111
#else
 
112
#   define compat_setup_timer(timer, function, data) \
 
113
       setup_timer(timer, function, data)
 
114
#endif
 
115
 
102
116
 
103
117
#endif /* __COMPAT_TIMER_H__ */