[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] Fix emacs local variable block to use correct C style variable.



commit 82639998a5f2afce55990c387dfdf06e032803e6
Author:     David Vrabel <david.vrabel@xxxxxxxxxx>
AuthorDate: Thu Feb 21 16:12:46 2013 +0000
Commit:     Keir <keir.xen@xxxxxxxxx>
CommitDate: Thu Feb 21 16:12:46 2013 +0000

    Fix emacs local variable block to use correct C style variable.
    
    The emacs variable to set the C style from a local variable block is
    c-file-style, not c-set-style.
    
    Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx
---
 extras/mini-os/events.c                       |    2 +-
 extras/mini-os/include/wait.h                 |    2 +-
 extras/mini-os/include/waittypes.h            |    2 +-
 extras/mini-os/lib/xmalloc.c                  |    2 +-
 extras/mini-os/sched.c                        |    2 +-
 tools/firmware/hvmloader/32bitbios_support.c  |    2 +-
 tools/firmware/hvmloader/acpi/acpi2_0.h       |    2 +-
 tools/firmware/hvmloader/acpi/build.c         |    2 +-
 tools/firmware/hvmloader/acpi/mk_dsdt.c       |    2 +-
 tools/firmware/hvmloader/acpi/static_tables.c |    2 +-
 tools/firmware/hvmloader/apic_regs.h          |    2 +-
 tools/firmware/hvmloader/cacheattr.c          |    2 +-
 tools/firmware/hvmloader/config-seabios.h     |    2 +-
 tools/firmware/hvmloader/config.h             |    2 +-
 tools/firmware/hvmloader/e820.c               |    2 +-
 tools/firmware/hvmloader/e820.h               |    2 +-
 tools/firmware/hvmloader/hvmloader.c          |    2 +-
 tools/firmware/hvmloader/hypercall.h          |    2 +-
 tools/firmware/hvmloader/mp_tables.c          |    2 +-
 tools/firmware/hvmloader/option_rom.h         |    2 +-
 tools/firmware/hvmloader/ovmf.c               |    2 +-
 tools/firmware/hvmloader/pci.c                |    2 +-
 tools/firmware/hvmloader/pci_regs.h           |    2 +-
 tools/firmware/hvmloader/pir.c                |    2 +-
 tools/firmware/hvmloader/pir_types.h          |    2 +-
 tools/firmware/hvmloader/rombios.c            |    2 +-
 tools/firmware/hvmloader/seabios.c            |    2 +-
 tools/firmware/hvmloader/smbios.c             |    2 +-
 tools/firmware/hvmloader/smbios_types.h       |    2 +-
 tools/firmware/hvmloader/smp.c                |    2 +-
 tools/firmware/hvmloader/tests.c              |    2 +-
 tools/firmware/hvmloader/util.c               |    2 +-
 tools/firmware/hvmloader/util.h               |    2 +-
 tools/firmware/hvmloader/xenbus.c             |    2 +-
 tools/libxc/xc_compression.c                  |    2 +-
 tools/libxc/xc_core.c                         |    2 +-
 tools/libxc/xc_core.h                         |    2 +-
 tools/libxc/xc_core_arm.c                     |    2 +-
 tools/libxc/xc_core_arm.h                     |    2 +-
 tools/libxc/xc_core_x86.c                     |    2 +-
 tools/libxc/xc_core_x86.h                     |    2 +-
 tools/libxc/xc_dom.h                          |    2 +-
 tools/libxc/xc_dom_arm.c                      |    2 +-
 tools/libxc/xc_dom_armzimageloader.c          |    2 +-
 tools/libxc/xc_dom_binloader.c                |    2 +-
 tools/libxc/xc_dom_boot.c                     |    2 +-
 tools/libxc/xc_dom_bzimageloader.c            |    2 +-
 tools/libxc/xc_dom_compat_linux.c             |    2 +-
 tools/libxc/xc_dom_core.c                     |    2 +-
 tools/libxc/xc_dom_elfloader.c                |    2 +-
 tools/libxc/xc_dom_x86.c                      |    2 +-
 tools/libxc/xc_domain.c                       |    2 +-
 tools/libxc/xc_domain_restore.c               |    2 +-
 tools/libxc/xc_domain_save.c                  |    2 +-
 tools/libxc/xc_evtchn.c                       |    2 +-
 tools/libxc/xc_flask.c                        |    2 +-
 tools/libxc/xc_foreign_memory.c               |    2 +-
 tools/libxc/xc_gnttab.c                       |    2 +-
 tools/libxc/xc_hcall_buf.c                    |    2 +-
 tools/libxc/xc_hvm_build_arm.c                |    2 +-
 tools/libxc/xc_hvm_build_x86.c                |    2 +-
 tools/libxc/xc_linux.c                        |    2 +-
 tools/libxc/xc_linux_osdep.c                  |    2 +-
 tools/libxc/xc_mem_access.c                   |    2 +-
 tools/libxc/xc_mem_paging.c                   |    2 +-
 tools/libxc/xc_minios.c                       |    2 +-
 tools/libxc/xc_misc.c                         |    2 +-
 tools/libxc/xc_netbsd.c                       |    2 +-
 tools/libxc/xc_nomigrate.c                    |    2 +-
 tools/libxc/xc_pagetab.c                      |    2 +-
 tools/libxc/xc_private.c                      |    2 +-
 tools/libxc/xc_solaris.c                      |    2 +-
 tools/libxc/xc_tmem.c                         |    2 +-
 tools/libxc/xenctrl_osdep_ENOSYS.c            |    2 +-
 tools/libxc/xenctrlosdep.h                    |    2 +-
 tools/libxc/xg_private.c                      |    2 +-
 tools/tests/xen-access/xen-access.c           |    2 +-
 tools/xenpaging/file_ops.c                    |    2 +-
 tools/xenpaging/file_ops.h                    |    2 +-
 tools/xenpaging/pagein.c                      |    2 +-
 tools/xenpaging/policy.h                      |    2 +-
 tools/xenpaging/policy_default.c              |    2 +-
 tools/xenpaging/xenpaging.c                   |    2 +-
 tools/xenpaging/xenpaging.h                   |    2 +-
 tools/xentrace/xenctx.c                       |    2 +-
 tools/xentrace/xentrace.c                     |    2 +-
 xen/arch/arm/arm32/asm-offsets.c              |    2 +-
 xen/arch/arm/domain.c                         |    2 +-
 xen/arch/arm/domain_build.c                   |    2 +-
 xen/arch/arm/domctl.c                         |    2 +-
 xen/arch/arm/gic.c                            |    2 +-
 xen/arch/arm/guestcopy.c                      |    2 +-
 xen/arch/arm/io.c                             |    2 +-
 xen/arch/arm/io.h                             |    2 +-
 xen/arch/arm/irq.c                            |    2 +-
 xen/arch/arm/kernel.c                         |    2 +-
 xen/arch/arm/kernel.h                         |    2 +-
 xen/arch/arm/mm.c                             |    2 +-
 xen/arch/arm/p2m.c                            |    2 +-
 xen/arch/arm/physdev.c                        |    2 +-
 xen/arch/arm/platforms/vexpress.c             |    2 +-
 xen/arch/arm/setup.c                          |    2 +-
 xen/arch/arm/shutdown.c                       |    2 +-
 xen/arch/arm/smp.c                            |    2 +-
 xen/arch/arm/smpboot.c                        |    2 +-
 xen/arch/arm/sysctl.c                         |    2 +-
 xen/arch/arm/time.c                           |    2 +-
 xen/arch/arm/traps.c                          |    2 +-
 xen/arch/arm/vgic.c                           |    2 +-
 xen/arch/arm/vpl011.c                         |    2 +-
 xen/arch/arm/vpl011.h                         |    2 +-
 xen/arch/arm/vtimer.c                         |    2 +-
 xen/arch/arm/vtimer.h                         |    2 +-
 xen/arch/x86/boot/mkelf32.c                   |    2 +-
 xen/arch/x86/bzimage.c                        |    2 +-
 xen/arch/x86/crash.c                          |    2 +-
 xen/arch/x86/domain.c                         |    2 +-
 xen/arch/x86/domain_build.c                   |    2 +-
 xen/arch/x86/domctl.c                         |    2 +-
 xen/arch/x86/gdbstub.c                        |    2 +-
 xen/arch/x86/hvm/asid.c                       |    2 +-
 xen/arch/x86/hvm/hvm.c                        |    2 +-
 xen/arch/x86/hvm/intercept.c                  |    2 +-
 xen/arch/x86/hvm/io.c                         |    2 +-
 xen/arch/x86/hvm/save.c                       |    2 +-
 xen/arch/x86/hvm/svm/asid.c                   |    2 +-
 xen/arch/x86/hvm/svm/emulate.c                |    2 +-
 xen/arch/x86/hvm/svm/intr.c                   |    2 +-
 xen/arch/x86/hvm/svm/svm.c                    |    2 +-
 xen/arch/x86/hvm/svm/svmdebug.c               |    2 +-
 xen/arch/x86/hvm/svm/vmcb.c                   |    2 +-
 xen/arch/x86/hvm/vmx/intr.c                   |    2 +-
 xen/arch/x86/hvm/vmx/vmcs.c                   |    2 +-
 xen/arch/x86/hvm/vmx/vmx.c                    |    2 +-
 xen/arch/x86/i387.c                           |    2 +-
 xen/arch/x86/ioport_emulate.c                 |    2 +-
 xen/arch/x86/machine_kexec.c                  |    2 +-
 xen/arch/x86/mm.c                             |    2 +-
 xen/arch/x86/mm/hap/guest_walk.c              |    2 +-
 xen/arch/x86/mm/hap/hap.c                     |    2 +-
 xen/arch/x86/mm/hap/nested_hap.c              |    2 +-
 xen/arch/x86/mm/mem_access.c                  |    2 +-
 xen/arch/x86/mm/mem_event.c                   |    2 +-
 xen/arch/x86/mm/mem_paging.c                  |    2 +-
 xen/arch/x86/mm/p2m-ept.c                     |    2 +-
 xen/arch/x86/mm/p2m.c                         |    2 +-
 xen/arch/x86/mm/paging.c                      |    2 +-
 xen/arch/x86/mm/shadow/common.c               |    2 +-
 xen/arch/x86/mm/shadow/multi.c                |    2 +-
 xen/arch/x86/mm/shadow/private.h              |    2 +-
 xen/arch/x86/mm/shadow/types.h                |    2 +-
 xen/arch/x86/oprofile/xenoprof.c              |    2 +-
 xen/arch/x86/physdev.c                        |    2 +-
 xen/arch/x86/platform_hypercall.c             |    2 +-
 xen/arch/x86/setup.c                          |    2 +-
 xen/arch/x86/shutdown.c                       |    2 +-
 xen/arch/x86/string.c                         |    2 +-
 xen/arch/x86/sysctl.c                         |    2 +-
 xen/arch/x86/tboot.c                          |    2 +-
 xen/arch/x86/time.c                           |    2 +-
 xen/arch/x86/traps.c                          |    2 +-
 xen/arch/x86/usercopy.c                       |    2 +-
 xen/arch/x86/x86_64/compat.c                  |    2 +-
 xen/arch/x86/x86_64/compat/mm.c               |    2 +-
 xen/arch/x86/x86_64/compat/traps.c            |    2 +-
 xen/arch/x86/x86_64/domain.c                  |    2 +-
 xen/arch/x86/x86_64/gdbstub.c                 |    2 +-
 xen/arch/x86/x86_64/machine_kexec.c           |    2 +-
 xen/arch/x86/x86_64/mm.c                      |    2 +-
 xen/arch/x86/x86_64/physdev.c                 |    2 +-
 xen/arch/x86/x86_64/platform_hypercall.c      |    2 +-
 xen/arch/x86/x86_64/traps.c                   |    2 +-
 xen/arch/x86/xstate.c                         |    2 +-
 xen/common/compat/domain.c                    |    2 +-
 xen/common/compat/grant_table.c               |    2 +-
 xen/common/compat/kernel.c                    |    2 +-
 xen/common/compat/multicall.c                 |    2 +-
 xen/common/compat/schedule.c                  |    2 +-
 xen/common/compat/tmem_xen.c                  |    2 +-
 xen/common/compat/xenoprof.c                  |    2 +-
 xen/common/compat/xlat.c                      |    2 +-
 xen/common/cpupool.c                          |    2 +-
 xen/common/device_tree.c                      |    2 +-
 xen/common/domain.c                           |    2 +-
 xen/common/domctl.c                           |    2 +-
 xen/common/event_channel.c                    |    2 +-
 xen/common/gdbstub.c                          |    2 +-
 xen/common/grant_table.c                      |    2 +-
 xen/common/hvm/save.c                         |    2 +-
 xen/common/kernel.c                           |    2 +-
 xen/common/kexec.c                            |    2 +-
 xen/common/keyhandler.c                       |    2 +-
 xen/common/lib.c                              |    2 +-
 xen/common/libelf/libelf-dominfo.c            |    2 +-
 xen/common/libelf/libelf-loader.c             |    2 +-
 xen/common/libelf/libelf-private.h            |    2 +-
 xen/common/libelf/libelf-relocate.c           |    2 +-
 xen/common/libelf/libelf-tools.c              |    2 +-
 xen/common/memory.c                           |    2 +-
 xen/common/multicall.c                        |    2 +-
 xen/common/page_alloc.c                       |    2 +-
 xen/common/perfc.c                            |    2 +-
 xen/common/sched_sedf.c                       |    2 +-
 xen/common/schedule.c                         |    2 +-
 xen/common/softirq.c                          |    2 +-
 xen/common/string.c                           |    2 +-
 xen/common/sysctl.c                           |    2 +-
 xen/common/tasklet.c                          |    2 +-
 xen/common/timer.c                            |    2 +-
 xen/common/tmem.c                             |    2 +-
 xen/common/trace.c                            |    2 +-
 xen/common/vsprintf.c                         |    2 +-
 xen/common/xencomm.c                          |    2 +-
 xen/common/xenoprof.c                         |    2 +-
 xen/drivers/char/console.c                    |    2 +-
 xen/drivers/char/ns16550.c                    |    2 +-
 xen/drivers/char/pl011.c                      |    2 +-
 xen/drivers/char/serial.c                     |    2 +-
 xen/drivers/passthrough/iommu.c               |    2 +-
 xen/drivers/passthrough/pci.c                 |    2 +-
 xen/drivers/passthrough/vtd/iommu.c           |    2 +-
 xen/drivers/passthrough/vtd/utils.c           |    2 +-
 xen/drivers/video/arm_hdlcd.c                 |    2 +-
 xen/include/asm-arm/asm_defns.h               |    2 +-
 xen/include/asm-arm/atomic.h                  |    2 +-
 xen/include/asm-arm/bitops.h                  |    2 +-
 xen/include/asm-arm/bug.h                     |    2 +-
 xen/include/asm-arm/byteorder.h               |    2 +-
 xen/include/asm-arm/cache.h                   |    2 +-
 xen/include/asm-arm/config.h                  |    2 +-
 xen/include/asm-arm/cpregs.h                  |    2 +-
 xen/include/asm-arm/current.h                 |    2 +-
 xen/include/asm-arm/debugger.h                |    2 +-
 xen/include/asm-arm/delay.h                   |    2 +-
 xen/include/asm-arm/desc.h                    |    2 +-
 xen/include/asm-arm/div64.h                   |    2 +-
 xen/include/asm-arm/domain.h                  |    2 +-
 xen/include/asm-arm/elf.h                     |    2 +-
 xen/include/asm-arm/event.h                   |    2 +-
 xen/include/asm-arm/flushtlb.h                |    2 +-
 xen/include/asm-arm/gic.h                     |    2 +-
 xen/include/asm-arm/grant_table.h             |    2 +-
 xen/include/asm-arm/guest_access.h            |    2 +-
 xen/include/asm-arm/hardirq.h                 |    2 +-
 xen/include/asm-arm/hypercall.h               |    2 +-
 xen/include/asm-arm/init.h                    |    2 +-
 xen/include/asm-arm/io.h                      |    2 +-
 xen/include/asm-arm/iocap.h                   |    2 +-
 xen/include/asm-arm/irq.h                     |    2 +-
 xen/include/asm-arm/mm.h                      |    2 +-
 xen/include/asm-arm/multicall.h               |    2 +-
 xen/include/asm-arm/nmi.h                     |    2 +-
 xen/include/asm-arm/numa.h                    |    2 +-
 xen/include/asm-arm/p2m.h                     |    2 +-
 xen/include/asm-arm/page.h                    |    2 +-
 xen/include/asm-arm/paging.h                  |    2 +-
 xen/include/asm-arm/percpu.h                  |    2 +-
 xen/include/asm-arm/platforms/vexpress.h      |    2 +-
 xen/include/asm-arm/processor-ca15.h          |    2 +-
 xen/include/asm-arm/processor.h               |    2 +-
 xen/include/asm-arm/regs.h                    |    2 +-
 xen/include/asm-arm/setup.h                   |    2 +-
 xen/include/asm-arm/smp.h                     |    2 +-
 xen/include/asm-arm/softirq.h                 |    2 +-
 xen/include/asm-arm/spinlock.h                |    2 +-
 xen/include/asm-arm/string.h                  |    2 +-
 xen/include/asm-arm/system.h                  |    2 +-
 xen/include/asm-arm/time.h                    |    2 +-
 xen/include/asm-arm/trace.h                   |    2 +-
 xen/include/asm-arm/types.h                   |    2 +-
 xen/include/asm-arm/vfp.h                     |    2 +-
 xen/include/asm-arm/xenoprof.h                |    2 +-
 xen/include/asm-x86/domain.h                  |    2 +-
 xen/include/asm-x86/elf.h                     |    2 +-
 xen/include/asm-x86/hap.h                     |    2 +-
 xen/include/asm-x86/hvm/asid.h                |    2 +-
 xen/include/asm-x86/hvm/svm/asid.h            |    2 +-
 xen/include/asm-x86/hvm/svm/emulate.h         |    2 +-
 xen/include/asm-x86/hvm/svm/nestedsvm.h       |    2 +-
 xen/include/asm-x86/hvm/svm/vmcb.h            |    2 +-
 xen/include/asm-x86/hvm/trace.h               |    2 +-
 xen/include/asm-x86/hvm/vmx/vmcs.h            |    2 +-
 xen/include/asm-x86/ldt.h                     |    2 +-
 xen/include/asm-x86/mem_access.h              |    2 +-
 xen/include/asm-x86/mem_event.h               |    2 +-
 xen/include/asm-x86/mem_paging.h              |    2 +-
 xen/include/asm-x86/p2m.h                     |    2 +-
 xen/include/asm-x86/page.h                    |    2 +-
 xen/include/asm-x86/paging.h                  |    2 +-
 xen/include/asm-x86/processor.h               |    2 +-
 xen/include/asm-x86/shadow.h                  |    2 +-
 xen/include/asm-x86/tboot.h                   |    2 +-
 xen/include/asm-x86/x86_64/elf.h              |    2 +-
 xen/include/asm-x86/x86_64/page.h             |    2 +-
 xen/include/asm-x86/xenoprof.h                |    2 +-
 xen/include/public/arch-arm.h                 |    2 +-
 xen/include/public/arch-arm/hvm/save.h        |    2 +-
 xen/include/public/arch-x86/xen-x86_32.h      |    2 +-
 xen/include/public/arch-x86/xen-x86_64.h      |    2 +-
 xen/include/public/arch-x86/xen.h             |    2 +-
 xen/include/public/callback.h                 |    2 +-
 xen/include/public/dom0_ops.h                 |    2 +-
 xen/include/public/domctl.h                   |    2 +-
 xen/include/public/elfnote.h                  |    2 +-
 xen/include/public/event_channel.h            |    2 +-
 xen/include/public/features.h                 |    2 +-
 xen/include/public/grant_table.h              |    2 +-
 xen/include/public/hvm/ioreq.h                |    2 +-
 xen/include/public/io/blkif.h                 |    2 +-
 xen/include/public/io/console.h               |    2 +-
 xen/include/public/io/fbif.h                  |    2 +-
 xen/include/public/io/kbdif.h                 |    2 +-
 xen/include/public/io/netif.h                 |    2 +-
 xen/include/public/io/pciif.h                 |    2 +-
 xen/include/public/io/ring.h                  |    2 +-
 xen/include/public/io/tpmif.h                 |    2 +-
 xen/include/public/io/vscsiif.h               |    2 +-
 xen/include/public/io/xenbus.h                |    2 +-
 xen/include/public/io/xs_wire.h               |    2 +-
 xen/include/public/kexec.h                    |    2 +-
 xen/include/public/mem_event.h                |    2 +-
 xen/include/public/memory.h                   |    2 +-
 xen/include/public/nmi.h                      |    2 +-
 xen/include/public/physdev.h                  |    2 +-
 xen/include/public/platform.h                 |    2 +-
 xen/include/public/sched.h                    |    2 +-
 xen/include/public/sysctl.h                   |    2 +-
 xen/include/public/tmem.h                     |    2 +-
 xen/include/public/trace.h                    |    2 +-
 xen/include/public/vcpu.h                     |    2 +-
 xen/include/public/version.h                  |    2 +-
 xen/include/public/xen.h                      |    2 +-
 xen/include/public/xenoprof.h                 |    2 +-
 xen/include/xen/elfcore.h                     |    2 +-
 xen/include/xen/gdbstub.h                     |    2 +-
 xen/include/xen/kexec.h                       |    2 +-
 xen/include/xen/sched.h                       |    2 +-
 xen/include/xen/serial.h                      |    2 +-
 xen/include/xen/time.h                        |    2 +-
 xen/include/xen/timer.h                       |    2 +-
 340 files changed, 340 insertions(+), 340 deletions(-)

diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c
index 2f359a5..896c365 100644
--- a/extras/mini-os/events.c
+++ b/extras/mini-os/events.c
@@ -261,7 +261,7 @@ int evtchn_bind_interdomain(domid_t pal, evtchn_port_t 
remote_port,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/extras/mini-os/include/wait.h b/extras/mini-os/include/wait.h
index bffa3c4..ecbe396 100644
--- a/extras/mini-os/include/wait.h
+++ b/extras/mini-os/include/wait.h
@@ -97,7 +97,7 @@ static inline void wake_up(struct wait_queue_head *head)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/extras/mini-os/include/waittypes.h 
b/extras/mini-os/include/waittypes.h
index 78d91c1..42a4786 100644
--- a/extras/mini-os/include/waittypes.h
+++ b/extras/mini-os/include/waittypes.h
@@ -24,7 +24,7 @@ MINIOS_STAILQ_HEAD(wait_queue_head, struct wait_queue);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/extras/mini-os/lib/xmalloc.c b/extras/mini-os/lib/xmalloc.c
index 23e367d..e16f161 100644
--- a/extras/mini-os/lib/xmalloc.c
+++ b/extras/mini-os/lib/xmalloc.c
@@ -311,7 +311,7 @@ void free(void *ptr)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c
index 2d27bfa..5ac5c1c 100644
--- a/extras/mini-os/sched.c
+++ b/extras/mini-os/sched.c
@@ -293,7 +293,7 @@ void init_sched(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/32bitbios_support.c 
b/tools/firmware/hvmloader/32bitbios_support.c
index 3ef8bd3..fe770a3 100644
--- a/tools/firmware/hvmloader/32bitbios_support.c
+++ b/tools/firmware/hvmloader/32bitbios_support.c
@@ -152,7 +152,7 @@ uint32_t rombios_highbios_setup(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h 
b/tools/firmware/hvmloader/acpi/acpi2_0.h
index b281ec0..7b22d80 100644
--- a/tools/firmware/hvmloader/acpi/acpi2_0.h
+++ b/tools/firmware/hvmloader/acpi/acpi2_0.h
@@ -405,7 +405,7 @@ void acpi_build_tables(struct acpi_config *config, unsigned 
int physical);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/acpi/build.c 
b/tools/firmware/hvmloader/acpi/build.c
index 9026e09..23d51a2 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -515,7 +515,7 @@ oom:
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c 
b/tools/firmware/hvmloader/acpi/mk_dsdt.c
index 38bbb04..996f30b 100644
--- a/tools/firmware/hvmloader/acpi/mk_dsdt.c
+++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c
@@ -453,7 +453,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/acpi/static_tables.c 
b/tools/firmware/hvmloader/acpi/static_tables.c
index b2be899..f98c8d2 100644
--- a/tools/firmware/hvmloader/acpi/static_tables.c
+++ b/tools/firmware/hvmloader/acpi/static_tables.c
@@ -159,7 +159,7 @@ struct acpi_20_waet Waet = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/apic_regs.h 
b/tools/firmware/hvmloader/apic_regs.h
index 2dd0010..f737b47 100644
--- a/tools/firmware/hvmloader/apic_regs.h
+++ b/tools/firmware/hvmloader/apic_regs.h
@@ -110,7 +110,7 @@
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/cacheattr.c 
b/tools/firmware/hvmloader/cacheattr.c
index 592b455..2f6c2f6 100644
--- a/tools/firmware/hvmloader/cacheattr.c
+++ b/tools/firmware/hvmloader/cacheattr.c
@@ -124,7 +124,7 @@ void cacheattr_init(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/config-seabios.h 
b/tools/firmware/hvmloader/config-seabios.h
index 22da23c..e025243 100644
--- a/tools/firmware/hvmloader/config-seabios.h
+++ b/tools/firmware/hvmloader/config-seabios.h
@@ -10,7 +10,7 @@
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/config.h 
b/tools/firmware/hvmloader/config.h
index 7f8a90f..8143d6f 100644
--- a/tools/firmware/hvmloader/config.h
+++ b/tools/firmware/hvmloader/config.h
@@ -88,7 +88,7 @@ extern unsigned long scratch_start;
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/e820.c b/tools/firmware/hvmloader/e820.c
index 0a46b80..2e05e93 100644
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -175,7 +175,7 @@ int build_e820_table(struct e820entry *e820,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/e820.h b/tools/firmware/hvmloader/e820.h
index 9c6866c..b2ead7f 100644
--- a/tools/firmware/hvmloader/e820.h
+++ b/tools/firmware/hvmloader/e820.h
@@ -20,7 +20,7 @@ struct e820entry {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/hvmloader.c 
b/tools/firmware/hvmloader/hvmloader.c
index a736331..9c1cba2 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -354,7 +354,7 @@ int main(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/hypercall.h 
b/tools/firmware/hvmloader/hypercall.h
index 9f3d3f9..5368c30 100644
--- a/tools/firmware/hvmloader/hypercall.h
+++ b/tools/firmware/hvmloader/hypercall.h
@@ -184,7 +184,7 @@ hypercall_hvm_op(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/mp_tables.c 
b/tools/firmware/hvmloader/mp_tables.c
index 2960627..fd636a0 100644
--- a/tools/firmware/hvmloader/mp_tables.c
+++ b/tools/firmware/hvmloader/mp_tables.c
@@ -341,7 +341,7 @@ unsigned long create_mp_tables(void *_mpfps)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/option_rom.h 
b/tools/firmware/hvmloader/option_rom.h
index 1ada3e2..0fefe08 100644
--- a/tools/firmware/hvmloader/option_rom.h
+++ b/tools/firmware/hvmloader/option_rom.h
@@ -59,7 +59,7 @@ int pci_load_option_roms(unsigned int option_rom_end,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index 59b8d89..ee4cbbf 100644
--- a/tools/firmware/hvmloader/ovmf.c
+++ b/tools/firmware/hvmloader/ovmf.c
@@ -118,7 +118,7 @@ struct bios_config ovmf_config =  {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c
index c7c87a7..c78d4d3 100644
--- a/tools/firmware/hvmloader/pci.c
+++ b/tools/firmware/hvmloader/pci.c
@@ -331,7 +331,7 @@ void pci_setup(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/pci_regs.h 
b/tools/firmware/hvmloader/pci_regs.h
index 0803f77..7bf2d87 100644
--- a/tools/firmware/hvmloader/pci_regs.h
+++ b/tools/firmware/hvmloader/pci_regs.h
@@ -112,7 +112,7 @@
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/pir.c b/tools/firmware/hvmloader/pir.c
index 893718c..cc420dd 100644
--- a/tools/firmware/hvmloader/pir.c
+++ b/tools/firmware/hvmloader/pir.c
@@ -68,7 +68,7 @@ unsigned long create_pir_tables(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/pir_types.h 
b/tools/firmware/hvmloader/pir_types.h
index 43934ed..6e50822 100644
--- a/tools/firmware/hvmloader/pir_types.h
+++ b/tools/firmware/hvmloader/pir_types.h
@@ -63,7 +63,7 @@ struct pir_table {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/rombios.c 
b/tools/firmware/hvmloader/rombios.c
index e0d4182..f6f5310 100644
--- a/tools/firmware/hvmloader/rombios.c
+++ b/tools/firmware/hvmloader/rombios.c
@@ -234,7 +234,7 @@ struct bios_config rombios_config =  {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/seabios.c 
b/tools/firmware/hvmloader/seabios.c
index 15ddf35..f17e67b 100644
--- a/tools/firmware/hvmloader/seabios.c
+++ b/tools/firmware/hvmloader/seabios.c
@@ -161,7 +161,7 @@ struct bios_config seabios_config = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/smbios.c 
b/tools/firmware/hvmloader/smbios.c
index 009bfc3..3d5dc51 100644
--- a/tools/firmware/hvmloader/smbios.c
+++ b/tools/firmware/hvmloader/smbios.c
@@ -939,7 +939,7 @@ smbios_type_127_init(void *start)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/smbios_types.h 
b/tools/firmware/hvmloader/smbios_types.h
index 13fa9a0..ff36564 100644
--- a/tools/firmware/hvmloader/smbios_types.h
+++ b/tools/firmware/hvmloader/smbios_types.h
@@ -237,7 +237,7 @@ struct smbios_type_127 {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/smp.c b/tools/firmware/hvmloader/smp.c
index 1825546..fa96878 100644
--- a/tools/firmware/hvmloader/smp.c
+++ b/tools/firmware/hvmloader/smp.c
@@ -134,7 +134,7 @@ void smp_initialise(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/tests.c b/tools/firmware/hvmloader/tests.c
index 033211e..52772aa 100644
--- a/tools/firmware/hvmloader/tests.c
+++ b/tools/firmware/hvmloader/tests.c
@@ -246,7 +246,7 @@ void perform_tests(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 741b9c2..80d822f 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -831,7 +831,7 @@ int hpet_exists(unsigned long hpet_base)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index ff06071..7913259 100644
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -243,7 +243,7 @@ extern char _start[], _end[];
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/firmware/hvmloader/xenbus.c 
b/tools/firmware/hvmloader/xenbus.c
index eeb7001..fe72e97 100644
--- a/tools/firmware/hvmloader/xenbus.c
+++ b/tools/firmware/hvmloader/xenbus.c
@@ -270,7 +270,7 @@ int xenstore_write(const char *path, const char *value)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c
index 11dd2a3..89f1be7 100644
--- a/tools/libxc/xc_compression.c
+++ b/tools/libxc/xc_compression.c
@@ -544,7 +544,7 @@ error:
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c
index 802fcae..4207eed 100644
--- a/tools/libxc/xc_core.c
+++ b/tools/libxc/xc_core.c
@@ -990,7 +990,7 @@ xc_domain_dumpcore(xc_interface *xch,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h
index 3f301d9..67b56a4 100644
--- a/tools/libxc/xc_core.h
+++ b/tools/libxc/xc_core.h
@@ -166,7 +166,7 @@ int xc_core_arch_map_p2m_writable(xc_interface *xch, 
unsigned int guest_width,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_core_arm.c b/tools/libxc/xc_core_arm.c
index e6716e4..2fbcf3f 100644
--- a/tools/libxc/xc_core_arm.c
+++ b/tools/libxc/xc_core_arm.c
@@ -99,7 +99,7 @@ xc_core_arch_map_p2m_writable(xc_interface *xch, unsigned int 
guest_width, xc_do
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_core_arm.h b/tools/libxc/xc_core_arm.h
index 3a6be2a..24781eb 100644
--- a/tools/libxc/xc_core_arm.h
+++ b/tools/libxc/xc_core_arm.h
@@ -52,7 +52,7 @@ xc_core_arch_context_get_shdr(xc_interface *xch,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c
index 43bf176..a9681f7 100644
--- a/tools/libxc/xc_core_x86.c
+++ b/tools/libxc/xc_core_x86.c
@@ -214,7 +214,7 @@ xc_core_arch_map_p2m_writable(xc_interface *xch, unsigned 
int guest_width, xc_do
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_core_x86.h b/tools/libxc/xc_core_x86.h
index 7b209f6..d5e04e7 100644
--- a/tools/libxc/xc_core_x86.h
+++ b/tools/libxc/xc_core_x86.h
@@ -53,7 +53,7 @@ xc_core_arch_context_get_shdr(xc_interface *xch,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom.h b/tools/libxc/xc_dom.h
index 7583d8c..779b9d4 100644
--- a/tools/libxc/xc_dom.h
+++ b/tools/libxc/xc_dom.h
@@ -337,7 +337,7 @@ int arch_setup_bootlate(struct xc_dom_image *dom);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c
index 2d33203..7f6d7ce 100644
--- a/tools/libxc/xc_dom_arm.c
+++ b/tools/libxc/xc_dom_arm.c
@@ -209,7 +209,7 @@ int xc_dom_feature_translated(struct xc_dom_image *dom)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_armzimageloader.c 
b/tools/libxc/xc_dom_armzimageloader.c
index f316e87..74027db 100644
--- a/tools/libxc/xc_dom_armzimageloader.c
+++ b/tools/libxc/xc_dom_armzimageloader.c
@@ -166,7 +166,7 @@ static void __init register_loader(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_binloader.c b/tools/libxc/xc_dom_binloader.c
index 769e97d..c14727c 100644
--- a/tools/libxc/xc_dom_binloader.c
+++ b/tools/libxc/xc_dom_binloader.c
@@ -296,7 +296,7 @@ static void __init register_loader(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c
index cd9319b..d4d57b4 100644
--- a/tools/libxc/xc_dom_boot.c
+++ b/tools/libxc/xc_dom_boot.c
@@ -431,7 +431,7 @@ int xc_dom_gnttab_init(struct xc_dom_image *dom)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_bzimageloader.c 
b/tools/libxc/xc_dom_bzimageloader.c
index b1b2eb0..6daa78c 100644
--- a/tools/libxc/xc_dom_bzimageloader.c
+++ b/tools/libxc/xc_dom_bzimageloader.c
@@ -757,7 +757,7 @@ static void __init register_loader(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_compat_linux.c 
b/tools/libxc/xc_dom_compat_linux.c
index 2183a3b..2c14a0f 100644
--- a/tools/libxc/xc_dom_compat_linux.c
+++ b/tools/libxc/xc_dom_compat_linux.c
@@ -190,7 +190,7 @@ int xc_dom_linux_build(xc_interface *xch,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c
index c8062d8..b92e4a9 100644
--- a/tools/libxc/xc_dom_core.c
+++ b/tools/libxc/xc_dom_core.c
@@ -895,7 +895,7 @@ int xc_dom_build_image(struct xc_dom_image *dom)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c
index 0f65620..6583859 100644
--- a/tools/libxc/xc_dom_elfloader.c
+++ b/tools/libxc/xc_dom_elfloader.c
@@ -339,7 +339,7 @@ static void __init register_loader(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
index 9cbdd62..eb9ac07 100644
--- a/tools/libxc/xc_dom_x86.c
+++ b/tools/libxc/xc_dom_x86.c
@@ -830,7 +830,7 @@ int xc_dom_feature_translated(struct xc_dom_image *dom)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 4b82884..480ce91 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -1533,7 +1533,7 @@ int xc_domain_set_virq_handler(xc_interface *xch, 
uint32_t domid, int virq)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c
index 5ef2fa3..a15f86a 100644
--- a/tools/libxc/xc_domain_restore.c
+++ b/tools/libxc/xc_domain_restore.c
@@ -2309,7 +2309,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, 
uint32_t dom,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c
index 6f27575..ff76626 100644
--- a/tools/libxc/xc_domain_save.c
+++ b/tools/libxc/xc_domain_save.c
@@ -2131,7 +2131,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t 
dom, uint32_t max_iter
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_evtchn.c b/tools/libxc/xc_evtchn.c
index d8c203f..2e0679e 100644
--- a/tools/libxc/xc_evtchn.c
+++ b/tools/libxc/xc_evtchn.c
@@ -126,7 +126,7 @@ int xc_evtchn_unmask(xc_evtchn *xce, evtchn_port_t port)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_flask.c b/tools/libxc/xc_flask.c
index face1e0..4294a25 100644
--- a/tools/libxc/xc_flask.c
+++ b/tools/libxc/xc_flask.c
@@ -435,7 +435,7 @@ int xc_flask_relabel_domain(xc_interface *xch, int domid, 
uint32_t sid)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_foreign_memory.c b/tools/libxc/xc_foreign_memory.c
index 2c6d8d3..7dfc817 100644
--- a/tools/libxc/xc_foreign_memory.c
+++ b/tools/libxc/xc_foreign_memory.c
@@ -124,7 +124,7 @@ void *xc_map_foreign_bulk_compat(xc_interface *xch, 
xc_osdep_handle h,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_gnttab.c b/tools/libxc/xc_gnttab.c
index cb5995f..a8cc381 100644
--- a/tools/libxc/xc_gnttab.c
+++ b/tools/libxc/xc_gnttab.c
@@ -233,7 +233,7 @@ int xc_gntshr_munmap(xc_gntshr *xcg, void *start_address, 
uint32_t count)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_hcall_buf.c b/tools/libxc/xc_hcall_buf.c
index ced9abd..c354677 100644
--- a/tools/libxc/xc_hcall_buf.c
+++ b/tools/libxc/xc_hcall_buf.c
@@ -231,7 +231,7 @@ void xc__hypercall_bounce_post(xc_interface *xch, 
xc_hypercall_buffer_t *b)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_hvm_build_arm.c b/tools/libxc/xc_hvm_build_arm.c
index c2def3b..ff66689 100644
--- a/tools/libxc/xc_hvm_build_arm.c
+++ b/tools/libxc/xc_hvm_build_arm.c
@@ -41,7 +41,7 @@ int xc_hvm_build_target_mem(xc_interface *xch,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_hvm_build_x86.c b/tools/libxc/xc_hvm_build_x86.c
index f0caf66..3b5d777 100644
--- a/tools/libxc/xc_hvm_build_x86.c
+++ b/tools/libxc/xc_hvm_build_x86.c
@@ -586,7 +586,7 @@ int xc_hvm_build_target_mem(xc_interface *xch,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_linux.c b/tools/libxc/xc_linux.c
index 5504df6..6121d80 100644
--- a/tools/libxc/xc_linux.c
+++ b/tools/libxc/xc_linux.c
@@ -70,7 +70,7 @@ void *xc_memalign(xc_interface *xch, size_t alignment, size_t 
size)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c
index ca545d8..36832b6 100644
--- a/tools/libxc/xc_linux_osdep.c
+++ b/tools/libxc/xc_linux_osdep.c
@@ -865,7 +865,7 @@ xc_osdep_info_t xc_osdep_info = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_mem_access.c b/tools/libxc/xc_mem_access.c
index 01fcf41..a50c145 100644
--- a/tools/libxc/xc_mem_access.c
+++ b/tools/libxc/xc_mem_access.c
@@ -58,7 +58,7 @@ int xc_mem_access_resume(xc_interface *xch, domid_t 
domain_id, unsigned long gfn
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c
index ab8c5ba..269cbdd 100644
--- a/tools/libxc/xc_mem_paging.c
+++ b/tools/libxc/xc_mem_paging.c
@@ -103,7 +103,7 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/tools/libxc/xc_minios.c b/tools/libxc/xc_minios.c
index ab86b72..dec4d73 100644
--- a/tools/libxc/xc_minios.c
+++ b/tools/libxc/xc_minios.c
@@ -543,7 +543,7 @@ xc_osdep_info_t xc_osdep_info = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c
index 3c5d64a..777727d 100644
--- a/tools/libxc/xc_misc.c
+++ b/tools/libxc/xc_misc.c
@@ -653,7 +653,7 @@ int xc_hvm_inject_trap(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_netbsd.c b/tools/libxc/xc_netbsd.c
index dbcb640..8a90ef3 100644
--- a/tools/libxc/xc_netbsd.c
+++ b/tools/libxc/xc_netbsd.c
@@ -412,7 +412,7 @@ xc_osdep_info_t xc_osdep_info = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_nomigrate.c b/tools/libxc/xc_nomigrate.c
index 27680a4..73e7566 100644
--- a/tools/libxc/xc_nomigrate.c
+++ b/tools/libxc/xc_nomigrate.c
@@ -46,7 +46,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t 
dom,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_pagetab.c b/tools/libxc/xc_pagetab.c
index b19a42c..27c4e9f 100644
--- a/tools/libxc/xc_pagetab.c
+++ b/tools/libxc/xc_pagetab.c
@@ -106,7 +106,7 @@ unsigned long xc_translate_foreign_address(xc_interface 
*xch, uint32_t dom,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index c0b73a6..e891cc8 100644
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -886,7 +886,7 @@ int xc_ffs64(uint64_t x)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_solaris.c b/tools/libxc/xc_solaris.c
index 497c923..7257a54 100644
--- a/tools/libxc/xc_solaris.c
+++ b/tools/libxc/xc_solaris.c
@@ -341,7 +341,7 @@ xc_osdep_info_t xc_osdep_info = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c
index 4b91c65..61e1549 100644
--- a/tools/libxc/xc_tmem.c
+++ b/tools/libxc/xc_tmem.c
@@ -521,7 +521,7 @@ int xc_tmem_restore_extra(xc_interface *xch, int dom, int 
io_fd)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xenctrl_osdep_ENOSYS.c 
b/tools/libxc/xenctrl_osdep_ENOSYS.c
index 4c156e9..4821342 100644
--- a/tools/libxc/xenctrl_osdep_ENOSYS.c
+++ b/tools/libxc/xenctrl_osdep_ENOSYS.c
@@ -198,7 +198,7 @@ xc_osdep_info_t xc_osdep_info = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xenctrlosdep.h b/tools/libxc/xenctrlosdep.h
index a36c4aa..e610a24 100644
--- a/tools/libxc/xenctrlosdep.h
+++ b/tools/libxc/xenctrlosdep.h
@@ -164,7 +164,7 @@ void xc_osdep_log(xc_interface *xch, xentoollog_level 
level, int code, const cha
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/libxc/xg_private.c b/tools/libxc/xg_private.c
index ef1c49d..8fa068e 100644
--- a/tools/libxc/xg_private.c
+++ b/tools/libxc/xg_private.c
@@ -201,7 +201,7 @@ __attribute__((weak))
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/tests/xen-access/xen-access.c 
b/tools/tests/xen-access/xen-access.c
index 9ec7332..49195a8 100644
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -708,7 +708,7 @@ exit:
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/tools/xenpaging/file_ops.c b/tools/xenpaging/file_ops.c
index 9351e16..9bc14b1 100644
--- a/tools/xenpaging/file_ops.c
+++ b/tools/xenpaging/file_ops.c
@@ -65,7 +65,7 @@ int write_page(int fd, void *page, int i)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/tools/xenpaging/file_ops.h b/tools/xenpaging/file_ops.h
index 081063d..53c9b6e 100644
--- a/tools/xenpaging/file_ops.h
+++ b/tools/xenpaging/file_ops.h
@@ -35,7 +35,7 @@ int write_page(int fd, void *page, int i);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/tools/xenpaging/pagein.c b/tools/xenpaging/pagein.c
index fe84b3c..b3bcef7 100644
--- a/tools/xenpaging/pagein.c
+++ b/tools/xenpaging/pagein.c
@@ -73,7 +73,7 @@ void create_page_in_thread(struct xenpaging *paging)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/tools/xenpaging/policy.h b/tools/xenpaging/policy.h
index 9bb5558..455931a 100644
--- a/tools/xenpaging/policy.h
+++ b/tools/xenpaging/policy.h
@@ -41,7 +41,7 @@ void policy_notify_dropped(unsigned long gfn);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/xenpaging/policy_default.c b/tools/xenpaging/policy_default.c
index 4648456..99cd5f8 100644
--- a/tools/xenpaging/policy_default.c
+++ b/tools/xenpaging/policy_default.c
@@ -179,7 +179,7 @@ void policy_notify_dropped(unsigned long gfn)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c
index 090e775..5ef2f09 100644
--- a/tools/xenpaging/xenpaging.c
+++ b/tools/xenpaging/xenpaging.c
@@ -1076,7 +1076,7 @@ int main(int argc, char *argv[])
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/tools/xenpaging/xenpaging.h b/tools/xenpaging/xenpaging.h
index 5a300c7..877db2f 100644
--- a/tools/xenpaging/xenpaging.h
+++ b/tools/xenpaging/xenpaging.h
@@ -74,7 +74,7 @@ extern void page_in_trigger(void);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/xentrace/xenctx.c b/tools/xentrace/xenctx.c
index 530ef65..62327f7 100644
--- a/tools/xentrace/xenctx.c
+++ b/tools/xentrace/xenctx.c
@@ -1103,7 +1103,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index e380531..622bac8 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -1065,7 +1065,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c
index cc1a72a..104430a 100644
--- a/xen/arch/arm/arm32/asm-offsets.c
+++ b/xen/arch/arm/arm32/asm-offsets.c
@@ -73,7 +73,7 @@ void __dummy__(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index e37ec54..63a166d 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -593,7 +593,7 @@ void vcpu_mark_events_pending(struct vcpu *v)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 7403f1a..879a20d 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -365,7 +365,7 @@ int construct_dom0(struct domain *d)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c
index c7ffd8a..c0f30e2 100644
--- a/xen/arch/arm/domctl.c
+++ b/xen/arch/arm/domctl.c
@@ -36,7 +36,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u 
c)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index 1c8219d..a84988e 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -667,7 +667,7 @@ void __cpuinit init_maintenance_interrupt(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/guestcopy.c b/xen/arch/arm/guestcopy.c
index 5504e19..c47558f 100644
--- a/xen/arch/arm/guestcopy.c
+++ b/xen/arch/arm/guestcopy.c
@@ -92,7 +92,7 @@ unsigned long raw_copy_from_guest(void *to, const void __user 
*from, unsigned le
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c
index 18f6164..ad28c26 100644
--- a/xen/arch/arm/io.c
+++ b/xen/arch/arm/io.c
@@ -45,7 +45,7 @@ int handle_mmio(mmio_info_t *info)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/io.h b/xen/arch/arm/io.h
index 0933aa8..4b0b985 100644
--- a/xen/arch/arm/io.h
+++ b/xen/arch/arm/io.h
@@ -50,7 +50,7 @@ extern int handle_mmio(mmio_info_t *info);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 587a725..8c96a0a 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -223,7 +223,7 @@ void pirq_set_affinity(struct domain *d, int pirq, const 
cpumask_t *mask)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
index c08c230..f694747 100644
--- a/xen/arch/arm/kernel.c
+++ b/xen/arch/arm/kernel.c
@@ -239,7 +239,7 @@ void kernel_load(struct kernel_info *info)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/kernel.h b/xen/arch/arm/kernel.h
index 49fe9da..58e942b 100644
--- a/xen/arch/arm/kernel.h
+++ b/xen/arch/arm/kernel.h
@@ -45,7 +45,7 @@ void kernel_load(struct kernel_info *info);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index fd4e628..c6fc50b 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -899,7 +899,7 @@ int is_iomem_page(unsigned long mfn)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index 852f0d8..c4fc05e 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -345,7 +345,7 @@ unsigned long gmfn_to_mfn(struct domain *d, unsigned long 
gpfn)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c
index 0801e8c..61b4a18 100644
--- a/xen/arch/arm/physdev.c
+++ b/xen/arch/arm/physdev.c
@@ -20,7 +20,7 @@ int do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/platforms/vexpress.c 
b/xen/arch/arm/platforms/vexpress.c
index b57b62e..fd4ce74 100644
--- a/xen/arch/arm/platforms/vexpress.c
+++ b/xen/arch/arm/platforms/vexpress.c
@@ -93,7 +93,7 @@ out:
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 5a86f90..43a69eb 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -473,7 +473,7 @@ void arch_get_xen_caps(xen_capabilities_info_t *info)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c
index 1278784..c1b60af 100644
--- a/xen/arch/arm/shutdown.c
+++ b/xen/arch/arm/shutdown.c
@@ -62,7 +62,7 @@ void machine_restart(unsigned int delay_millisecs)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/smp.c b/xen/arch/arm/smp.c
index 824c8c8..12260f4 100644
--- a/xen/arch/arm/smp.c
+++ b/xen/arch/arm/smp.c
@@ -31,7 +31,7 @@ void smp_send_event_check_mask(const cpumask_t *mask)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 60be1a4..8936123 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -253,7 +253,7 @@ void __cpu_die(unsigned int cpu)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c
index a5d9cf0..6388204 100644
--- a/xen/arch/arm/sysctl.c
+++ b/xen/arch/arm/sysctl.c
@@ -23,7 +23,7 @@ long arch_do_sysctl(struct xen_sysctl *sysctl,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 3dad9b3..e48305f 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -225,7 +225,7 @@ struct tm wallclock_time(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index eaf1f52..3257060 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -805,7 +805,7 @@ asmlinkage void leave_hypervisor_tail(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 39b9775..6ae33f6 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -619,7 +619,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq, 
int virtual)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c
index 7dcee90..b5fdc87 100644
--- a/xen/arch/arm/vpl011.c
+++ b/xen/arch/arm/vpl011.c
@@ -142,7 +142,7 @@ const struct mmio_handler uart0_mmio_handler = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/vpl011.h b/xen/arch/arm/vpl011.h
index eabd99d..f0d0a82 100644
--- a/xen/arch/arm/vpl011.h
+++ b/xen/arch/arm/vpl011.h
@@ -28,7 +28,7 @@ extern void domain_uart0_free(struct domain *d);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index f4326f8..cc9238b 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -199,7 +199,7 @@ int vtimer_emulate(struct cpu_user_regs *regs, union hsr 
hsr)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/arm/vtimer.h b/xen/arch/arm/vtimer.h
index 43eef69..690231d 100644
--- a/xen/arch/arm/vtimer.h
+++ b/xen/arch/arm/vtimer.h
@@ -31,7 +31,7 @@ extern void vcpu_timer_destroy(struct vcpu *v);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c
index d616fb1..b369222 100644
--- a/xen/arch/x86/boot/mkelf32.c
+++ b/xen/arch/x86/boot/mkelf32.c
@@ -399,7 +399,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/bzimage.c b/xen/arch/x86/bzimage.c
index 5adc223..c5519d8 100644
--- a/xen/arch/x86/bzimage.c
+++ b/xen/arch/x86/bzimage.c
@@ -273,7 +273,7 @@ int __init bzimage_parse(char *image_base, char 
**image_start, unsigned long *im
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c
index b6c0a7f..0a807d1 100644
--- a/xen/arch/x86/crash.c
+++ b/xen/arch/x86/crash.c
@@ -198,7 +198,7 @@ void machine_crash_shutdown(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 6bb8cb6..c1f96ff 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -2219,7 +2219,7 @@ __initcall(init_vcpu_kick_softirq);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 2b23cc9..c8f435d 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -1140,7 +1140,7 @@ int __init construct_dom0(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 3c416b6..a196e2a 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -1371,7 +1371,7 @@ void arch_get_info_guest(struct vcpu *v, 
vcpu_guest_context_u c)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/gdbstub.c b/xen/arch/x86/gdbstub.c
index 4416503..2390a1b 100644
--- a/xen/arch/x86/gdbstub.c
+++ b/xen/arch/x86/gdbstub.c
@@ -82,7 +82,7 @@ gdb_arch_resume(struct cpu_user_regs *regs,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * End:
diff --git a/xen/arch/x86/hvm/asid.c b/xen/arch/x86/hvm/asid.c
index f69b27e..21ec492 100644
--- a/xen/arch/x86/hvm/asid.c
+++ b/xen/arch/x86/hvm/asid.c
@@ -152,7 +152,7 @@ bool_t hvm_asid_handle_vmenter(struct hvm_vcpu_asid *asid)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index ac915a1..febbffb 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -4629,7 +4629,7 @@ enum hvm_intblk nhvm_interrupt_blocked(struct vcpu *v)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c
index af22d11..85caa0c 100644
--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -252,7 +252,7 @@ void relocate_io_handler(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c
index 444b96f..4ae2c0c 100644
--- a/xen/arch/x86/hvm/io.c
+++ b/xen/arch/x86/hvm/io.c
@@ -417,7 +417,7 @@ int dpci_ioport_intercept(ioreq_t *p)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/save.c b/xen/arch/x86/hvm/save.c
index 26dbef7..066fdb2 100644
--- a/xen/arch/x86/hvm/save.c
+++ b/xen/arch/x86/hvm/save.c
@@ -76,7 +76,7 @@ int arch_hvm_load(struct domain *d, struct hvm_save_header 
*hdr)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c
index 3fde363..344e143 100644
--- a/xen/arch/x86/hvm/svm/asid.c
+++ b/xen/arch/x86/hvm/svm/asid.c
@@ -64,7 +64,7 @@ void svm_asid_handle_vmrun(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/svm/emulate.c b/xen/arch/x86/hvm/svm/emulate.c
index 2cbd8ef..37a1ece 100644
--- a/xen/arch/x86/hvm/svm/emulate.c
+++ b/xen/arch/x86/hvm/svm/emulate.c
@@ -226,7 +226,7 @@ int __get_instruction_length_from_list(struct vcpu *v,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c
index d7aa7ae..da2bcca 100644
--- a/xen/arch/x86/hvm/svm/intr.c
+++ b/xen/arch/x86/hvm/svm/intr.c
@@ -223,7 +223,7 @@ void svm_intr_assist(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index acd2d49..f170ffb 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -2427,7 +2427,7 @@ void svm_trace_vmentry(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/svm/svmdebug.c b/xen/arch/x86/hvm/svm/svmdebug.c
index 2cb684f..ce7d055 100644
--- a/xen/arch/x86/hvm/svm/svmdebug.c
+++ b/xen/arch/x86/hvm/svm/svmdebug.c
@@ -187,7 +187,7 @@ svm_vmcb_isvalid(const char *from, struct vmcb_struct *vmcb,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c
index e604df9..ab32e52 100644
--- a/xen/arch/x86/hvm/svm/vmcb.c
+++ b/xen/arch/x86/hvm/svm/vmcb.c
@@ -318,7 +318,7 @@ void setup_vmcb_dump(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c
index 20d127a..e376f3c 100644
--- a/xen/arch/x86/hvm/vmx/intr.c
+++ b/xen/arch/x86/hvm/vmx/intr.c
@@ -333,7 +333,7 @@ void vmx_intr_assist(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index a320fbd..9926ffb 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -1485,7 +1485,7 @@ void setup_vmcs_dump(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 9a5be75..5378928 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2819,7 +2819,7 @@ void vmx_vmenter_helper(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c
index 102ee29..9127037 100644
--- a/xen/arch/x86/i387.c
+++ b/xen/arch/x86/i387.c
@@ -256,7 +256,7 @@ void vcpu_destroy_fpu(struct vcpu *v)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/ioport_emulate.c b/xen/arch/x86/ioport_emulate.c
index b3d0ce9..027ec29 100644
--- a/xen/arch/x86/ioport_emulate.c
+++ b/xen/arch/x86/ioport_emulate.c
@@ -127,7 +127,7 @@ __initcall(ioport_quirks_init);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c
index 8191ef1..68b9705 100644
--- a/xen/arch/x86/machine_kexec.c
+++ b/xen/arch/x86/machine_kexec.c
@@ -152,7 +152,7 @@ void arch_crash_save_vmcoreinfo(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index fce73e1..add93ac 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -5600,7 +5600,7 @@ void arch_dump_shared_mem_info(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c
index 67b7497..25d9792 100644
--- a/xen/arch/x86/mm/hap/guest_walk.c
+++ b/xen/arch/x86/mm/hap/guest_walk.c
@@ -142,7 +142,7 @@ unsigned long hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index f353d3a..055833d 100644
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -769,7 +769,7 @@ static const struct paging_mode hap_paging_long_mode = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c
index e447117..c2ef1d1 100644
--- a/xen/arch/x86/mm/hap/nested_hap.c
+++ b/xen/arch/x86/mm/hap/nested_hap.c
@@ -287,7 +287,7 @@ nestedhvm_hap_nested_page_fault(struct vcpu *v, paddr_t 
*L2_gpa,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/mm/mem_access.c b/xen/arch/x86/mm/mem_access.c
index a08416c..50aaf27 100644
--- a/xen/arch/x86/mm/mem_access.c
+++ b/xen/arch/x86/mm/mem_access.c
@@ -63,7 +63,7 @@ int mem_access_send_req(struct domain *d, mem_event_request_t 
*req)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c
index 4222248..d00e404 100644
--- a/xen/arch/x86/mm/mem_event.c
+++ b/xen/arch/x86/mm/mem_event.c
@@ -659,7 +659,7 @@ int mem_event_domctl(struct domain *d, 
xen_domctl_mem_event_op_t *mec,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c
index 8f11049..235776d 100644
--- a/xen/arch/x86/mm/mem_paging.c
+++ b/xen/arch/x86/mm/mem_paging.c
@@ -63,7 +63,7 @@ int mem_paging_memop(struct domain *d, xen_mem_event_op_t 
*mec)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c
index db3e3d4..a2d1591 100644
--- a/xen/arch/x86/mm/p2m-ept.c
+++ b/xen/arch/x86/mm/p2m-ept.c
@@ -932,7 +932,7 @@ void setup_ept_dump(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 2db73c9..b70716d 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1720,7 +1720,7 @@ out_p2m_audit:
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index ac9bb1a..cd08b2a 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -731,7 +731,7 @@ void paging_write_p2m_entry(struct p2m_domain *p2m, 
unsigned long gfn,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 292c1f7..691776c 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -3769,7 +3769,7 @@ void shadow_audit_tables(struct vcpu *v)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index b79cd6c..f7181b7 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -5180,7 +5180,7 @@ const struct paging_mode sh_paging_mode = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End: 
diff --git a/xen/arch/x86/mm/shadow/private.h b/xen/arch/x86/mm/shadow/private.h
index a467e48..58844f1 100644
--- a/xen/arch/x86/mm/shadow/private.h
+++ b/xen/arch/x86/mm/shadow/private.h
@@ -825,7 +825,7 @@ static inline int sh_check_page_has_no_refs(struct 
page_info *page)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h
index 43ce1db..953d168 100644
--- a/xen/arch/x86/mm/shadow/types.h
+++ b/xen/arch/x86/mm/shadow/types.h
@@ -359,7 +359,7 @@ static inline u32 sh_l1e_mmio_get_flags(shadow_l1e_t sl1e)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/arch/x86/oprofile/xenoprof.c b/xen/arch/x86/oprofile/xenoprof.c
index 33aaeb6..002a696 100644
--- a/xen/arch/x86/oprofile/xenoprof.c
+++ b/xen/arch/x86/oprofile/xenoprof.c
@@ -99,7 +99,7 @@ int xenoprofile_get_mode(struct vcpu *curr, const struct 
cpu_user_regs *regs)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index d9ed5df..134eb73 100644
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -699,7 +699,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) 
arg)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/platform_hypercall.c 
b/xen/arch/x86/platform_hypercall.c
index 5ca2840..c1bc4f8 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -611,7 +611,7 @@ ret_t 
do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 83335ad..55666c7 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1451,7 +1451,7 @@ int __init xen_in_range(unsigned long mfn)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 252420c..7593191 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -190,7 +190,7 @@ void machine_restart(unsigned int delay_millisecs)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c
index c284ad2..3af0ea8 100644
--- a/xen/arch/x86/string.c
+++ b/xen/arch/x86/string.c
@@ -60,7 +60,7 @@ void *memmove(void *dest, const void *src, size_t n)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c
index b4d3e32..15d4b91 100644
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -112,7 +112,7 @@ long arch_do_sysctl(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index a61b19e..1eed2e3 100644
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -546,7 +546,7 @@ int tboot_wake_ap(int apicid, unsigned long sipi_vec)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 84c67a7..244b43e 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -1997,7 +1997,7 @@ __initcall(setup_dump_softtsc);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 1ae7412..d36eddd 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -3735,7 +3735,7 @@ unsigned long do_get_debugreg(int reg)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/usercopy.c b/xen/arch/x86/usercopy.c
index 47dadae..8bd9469 100644
--- a/xen/arch/x86/usercopy.c
+++ b/xen/arch/x86/usercopy.c
@@ -175,7 +175,7 @@ copy_from_user(void *to, const void __user *from, unsigned 
n)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c
index 2a14d18..69b9aa0 100644
--- a/xen/arch/x86/x86_64/compat.c
+++ b/xen/arch/x86/x86_64/compat.c
@@ -22,7 +22,7 @@ typedef int ret_t;
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c
index a455c6c..75e422d 100644
--- a/xen/arch/x86/x86_64/compat/mm.c
+++ b/xen/arch/x86/x86_64/compat/mm.c
@@ -395,7 +395,7 @@ int 
compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/compat/traps.c 
b/xen/arch/x86/x86_64/compat/traps.c
index 2b67e35..6816b0e 100644
--- a/xen/arch/x86/x86_64/compat/traps.c
+++ b/xen/arch/x86/x86_64/compat/traps.c
@@ -389,7 +389,7 @@ static void hypercall_page_initialise_ring1_kernel(void 
*hypercall_page)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/domain.c b/xen/arch/x86/x86_64/domain.c
index 144ca2d..d630ef4 100644
--- a/xen/arch/x86/x86_64/domain.c
+++ b/xen/arch/x86/x86_64/domain.c
@@ -75,7 +75,7 @@ arch_compat_vcpu_op(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/gdbstub.c b/xen/arch/x86/x86_64/gdbstub.c
index a91f468..3b5604a 100644
--- a/xen/arch/x86/x86_64/gdbstub.c
+++ b/xen/arch/x86/x86_64/gdbstub.c
@@ -144,7 +144,7 @@ gdb_arch_write_reg(unsigned long regnum, unsigned long val,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * End:
diff --git a/xen/arch/x86/x86_64/machine_kexec.c 
b/xen/arch/x86/x86_64/machine_kexec.c
index 0d4b1a1..f4a005c 100644
--- a/xen/arch/x86/x86_64/machine_kexec.c
+++ b/xen/arch/x86/x86_64/machine_kexec.c
@@ -21,7 +21,7 @@ int machine_kexec_get_xen(xen_kexec_range_t *range)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
index aae69e0..8a5e1cc 100644
--- a/xen/arch/x86/x86_64/mm.c
+++ b/xen/arch/x86/x86_64/mm.c
@@ -1575,7 +1575,7 @@ destroy_frametable:
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/physdev.c b/xen/arch/x86/x86_64/physdev.c
index 2057f23..d376cd0 100644
--- a/xen/arch/x86/x86_64/physdev.c
+++ b/xen/arch/x86/x86_64/physdev.c
@@ -85,7 +85,7 @@ typedef int ret_t;
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/platform_hypercall.c 
b/xen/arch/x86/x86_64/platform_hypercall.c
index 744796d..aa2ad54 100644
--- a/xen/arch/x86/x86_64/platform_hypercall.c
+++ b/xen/arch/x86/x86_64/platform_hypercall.c
@@ -46,7 +46,7 @@ typedef int ret_t;
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index 2afa53a..eec919a 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -631,7 +631,7 @@ void hypercall_page_initialise(struct domain *d, void 
*hypercall_page)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c
index 80f77cb..549406c 100644
--- a/xen/arch/x86/xstate.c
+++ b/xen/arch/x86/xstate.c
@@ -180,7 +180,7 @@ void xstate_init(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c
index e4c8ceb..aac8f46 100644
--- a/xen/common/compat/domain.c
+++ b/xen/common/compat/domain.c
@@ -102,7 +102,7 @@ int compat_vcpu_op(int cmd, int vcpuid, 
XEN_GUEST_HANDLE_PARAM(void) arg)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c
index 38f3b37..7ebbbc1 100644
--- a/xen/common/compat/grant_table.c
+++ b/xen/common/compat/grant_table.c
@@ -348,7 +348,7 @@ int compat_grant_table_op(unsigned int cmd,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/kernel.c b/xen/common/compat/kernel.c
index a2a2751..6a1e41f 100644
--- a/xen/common/compat/kernel.c
+++ b/xen/common/compat/kernel.c
@@ -49,7 +49,7 @@ CHECK_TYPE(domain_handle);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/multicall.c b/xen/common/compat/multicall.c
index 3219d3c..95c047a 100644
--- a/xen/common/compat/multicall.c
+++ b/xen/common/compat/multicall.c
@@ -43,7 +43,7 @@ static void __trace_multicall_call(multicall_entry_t *call)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/schedule.c b/xen/common/compat/schedule.c
index 5795279..812c550 100644
--- a/xen/common/compat/schedule.c
+++ b/xen/common/compat/schedule.c
@@ -43,7 +43,7 @@ int compat_set_timer_op(u32 lo, s32 hi)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/tmem_xen.c b/xen/common/compat/tmem_xen.c
index f6c9e04..97c7ff2 100644
--- a/xen/common/compat/tmem_xen.c
+++ b/xen/common/compat/tmem_xen.c
@@ -18,7 +18,7 @@
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/xenoprof.c b/xen/common/compat/xenoprof.c
index 66fd99e..8fbd86c 100644
--- a/xen/common/compat/xenoprof.c
+++ b/xen/common/compat/xenoprof.c
@@ -34,7 +34,7 @@ CHECK_oprof_passive;
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/compat/xlat.c b/xen/common/compat/xlat.c
index 2a8dc6d..ffc8f8f 100644
--- a/xen/common/compat/xlat.c
+++ b/xen/common/compat/xlat.c
@@ -65,7 +65,7 @@ CHECK_vcpu_time_info;
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c
index c036c2c..10b10f8 100644
--- a/xen/common/cpupool.c
+++ b/xen/common/cpupool.c
@@ -674,7 +674,7 @@ presmp_initcall(cpupool_presmp_init);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 5301d63..9af0cd4 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -440,7 +440,7 @@ size_t __init device_tree_early_init(const void *fdt)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * indent-tabs-mode: nil
  * End:
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 07f62b3..b360de1 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -1106,7 +1106,7 @@ int continue_hypercall_on_cpu(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index a713ce6..b7f6619 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -822,7 +822,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) 
u_domctl)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 2d7afc9..a0f293f 100644
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -1334,7 +1334,7 @@ __initcall(dump_evtchn_info_key_init);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/gdbstub.c b/xen/common/gdbstub.c
index 737be8c..2baa91a 100644
--- a/xen/common/gdbstub.c
+++ b/xen/common/gdbstub.c
@@ -742,7 +742,7 @@ static void gdb_smp_resume(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * End:
diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index f85adb4..287714b 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -2880,7 +2880,7 @@ __initcall(gnttab_usage_init);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c
index 6e8d9a3..de76ada 100644
--- a/xen/common/hvm/save.c
+++ b/xen/common/hvm/save.c
@@ -312,7 +312,7 @@ void _hvm_read_entry(struct hvm_domain_context *h,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 55caff6..72fb905 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -370,7 +370,7 @@ DO(ni_hypercall)(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index a6581a0..7b04c1c 100644
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -900,7 +900,7 @@ int compat_kexec_op(unsigned long op, 
XEN_GUEST_HANDLE_PARAM(void) uarg)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 98a2c7f..e9ef45f 100644
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -559,7 +559,7 @@ void __init initialize_keytable(void)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/lib.c b/xen/common/lib.c
index 03c8b8b..018345e 100644
--- a/xen/common/lib.c
+++ b/xen/common/lib.c
@@ -481,7 +481,7 @@ unsigned long long parse_size_and_unit(const char *s, const 
char **ps)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/libelf/libelf-dominfo.c 
b/xen/common/libelf/libelf-dominfo.c
index 523837f..3242f54 100644
--- a/xen/common/libelf/libelf-dominfo.c
+++ b/xen/common/libelf/libelf-dominfo.c
@@ -555,7 +555,7 @@ int elf_xen_parse(struct elf_binary *elf,
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/libelf/libelf-loader.c 
b/xen/common/libelf/libelf-loader.c
index ab58b8b..3cf9c59 100644
--- a/xen/common/libelf/libelf-loader.c
+++ b/xen/common/libelf/libelf-loader.c
@@ -313,7 +313,7 @@ uint64_t elf_lookup_addr(struct elf_binary * elf, const 
char *symbol)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/libelf/libelf-private.h 
b/xen/common/libelf/libelf-private.h
index 3ef753c..0d4dcf6 100644
--- a/xen/common/libelf/libelf-private.h
+++ b/xen/common/libelf/libelf-private.h
@@ -91,7 +91,7 @@ do { strncpy((d),(s),sizeof((d))-1);            \
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/libelf/libelf-relocate.c 
b/xen/common/libelf/libelf-relocate.c
index 7ef4b01..2aafc44 100644
--- a/xen/common/libelf/libelf-relocate.c
+++ b/xen/common/libelf/libelf-relocate.c
@@ -364,7 +364,7 @@ int elf_reloc(struct elf_binary *elf)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c
index cb97908..8312065 100644
--- a/xen/common/libelf/libelf-tools.c
+++ b/xen/common/libelf/libelf-tools.c
@@ -276,7 +276,7 @@ int elf_phdr_is_loadable(struct elf_binary *elf, const 
elf_phdr * phdr)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/memory.c b/xen/common/memory.c
index 6b4ef73..08550ef 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -723,7 +723,7 @@ long do_memory_op(unsigned long cmd, 
XEN_GUEST_HANDLE_PARAM(void) arg)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/multicall.c b/xen/common/multicall.c
index 7e557e5..2afba98 100644
--- a/xen/common/multicall.c
+++ b/xen/common/multicall.c
@@ -108,7 +108,7 @@ do_multicall(
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 6c2215b..9e9fb15 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -1564,7 +1564,7 @@ __initcall(register_heap_trigger);
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 215e074..96a4245 100644
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -275,7 +275,7 @@ int perfc_control(xen_sysctl_perfc_op_t *pc)
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/sched_sedf.c b/xen/common/sched_sedf.c
index c45cca0..27fac36 100644
--- a/xen/common/sched_sedf.c
+++ b/xen/common/sched_sedf.c
@@ -1537,7 +1537,7 @@ const struct scheduler sched_sedf_def = {
 /*
  * Local variables:
  * mode: C
- * c-set-style: "BSD"
+ * c-file-style: "BSD"
  * c-basic-offset: 4
  * tab-width: 4
  * indent-tabs-mode: nil
diff --git a/xen/common/schedule.c b/xen/common/schedule.c

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.