search for: 65,14

.../core/core/gpuobj.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/core/gpuobj.c b/drivers/gpu/drm/nouveau/core/core/gpuobj.c index 7595506..7bcae1d 100644 --- a/drivers/gpu/drm/nouveau/core/core/gpuobj.c +++ b/drivers/gpu/drm/nouveau/core/core/gpuobj.c @@ -65,6 +65,14 @@ nouveau_gpuobj_create_(struct nouveau_object *parent, int ret, i; u64 addr; + /* + * There are a lot of places that allocate multiples of 1000, + * but do not set alignment correctly and still require this + * alignment implicitly or explicitly. + */ + if (size >= 0x1000 &a...

...tions(+), 35 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c b/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c index fdde11f..941555f 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c @@ -65,14 +65,9 @@ nv50_constbufs_validate(struct nv50_context *nv50) PUSH_DATA (push, (b << 12) | (i << 8) | p | 1); } while (words) { - unsigned nr; - - if (!PUSH_SPACE(push, 16)) - break; -...

...allium/drivers/nouveau/nv50/nv50_shader_state.c >> b/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c >> index fdde11f..941555f 100644 >> --- a/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c >> +++ b/src/gallium/drivers/nouveau/nv50/nv50_shader_state.c >> @@ -65,14 +65,9 @@ nv50_constbufs_validate(struct nv50_context *nv50) >> PUSH_DATA (push, (b << 12) | (i << 8) | p | 1); >> } >> while (words) { >> - unsigned nr; >> - >> - if (!PUSH_SP...

...AMD, Cyrix, IBM, or Intel. Includes DX, @@ -55,6 +57,7 @@ config M486 config M586 bool "586/K5/5x86/6x86/6x86MX" + depends on !X86_VMI help Select this for an 586 or 686 series processor such as the AMD K5, the Cyrix 5x86, 6x86 and 6x86MX. This choice does not @@ -62,12 +65,14 @@ config M586 config M586TSC bool "Pentium-Classic" + depends on !X86_VMI help Select this for a Pentium Classic processor with the RDTSC (Read Time Stamp Counter) instruction for benchmarking. config M586MMX bool "Pentium-MMX" + depends on !X86_VMI hel...

...AMD, Cyrix, IBM, or Intel. Includes DX, @@ -55,6 +57,7 @@ config M486 config M586 bool "586/K5/5x86/6x86/6x86MX" + depends on !X86_VMI help Select this for an 586 or 686 series processor such as the AMD K5, the Cyrix 5x86, 6x86 and 6x86MX. This choice does not @@ -62,12 +65,14 @@ config M586 config M586TSC bool "Pentium-Classic" + depends on !X86_VMI help Select this for a Pentium Classic processor with the RDTSC (Read Time Stamp Counter) instruction for benchmarking. config M586MMX bool "Pentium-MMX" + depends on !X86_VMI hel...

...mu/fuc/macros.fuc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc b/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc index 3737bd27..d14f2771 100644 --- a/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc +++ b/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc @@ -65,6 +65,14 @@ #define NV_PPWR_RFIFO_GET 0x04cc #define NV_PPWR_H2D 0x04d0 #define NV_PPWR_D2H 0x04dc +#define NV_PPWR_COUNTER_MASK(i)...

...or function depending on log_sink. +/* Call the right log_*_verror function depending on log_sink. * Note: preserves the previous value of errno. */ void -nbdkit_verror (const char *fs, va_list args) +log_verror (const char *fs, va_list args) { switch (log_to) { case LOG_TO_DEFAULT: @@ -65,9 +65,14 @@ nbdkit_verror (const char *fs, va_list args) } } -/* Wrapper around nbdkit_verror. - * Note: preserves the previous value of errno. - */ +/* Note: preserves the previous value of errno. */ +void +nbdkit_verror (const char *fs, va_list args) +{ + log_verror (fs, args); +} + +/* No...

...gt; 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/nouveau/core/core/gpuobj.c b/drivers/gpu/drm/nouveau/core/core/gpuobj.c > index 7595506..7bcae1d 100644 > --- a/drivers/gpu/drm/nouveau/core/core/gpuobj.c > +++ b/drivers/gpu/drm/nouveau/core/core/gpuobj.c > @@ -65,6 +65,14 @@ nouveau_gpuobj_create_(struct nouveau_object *parent, > int ret, i; > u64 addr; > > + /* > + * There are a lot of places that allocate multiples of 1000, > + * but do not set alignment correctly and still require this > + *...

...an empty string as return value. --- daemon/echo-daemon.c | 8 ++++++++ generator/actions.ml | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/daemon/echo-daemon.c b/daemon/echo-daemon.c index c805819..d8f1028 100644 --- a/daemon/echo-daemon.c +++ b/daemon/echo-daemon.c @@ -65,6 +65,14 @@ do_echo_daemon (char *const *argv) argv++; } + if (NULL == out) { + /* No strings, so create a new empty array. */ + out = malloc (sizeof (char *)); + if (NULL == out) { + reply_with_perror ("malloc"); + return NULL; + } + } /* NULL termi...

...e Paul <lyude at redhat.com> --- tests/kms_pipe_crc_basic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c index d169b7bd..f121e27e 100644 --- a/tests/kms_pipe_crc_basic.c +++ b/tests/kms_pipe_crc_basic.c @@ -65,15 +65,14 @@ static void test_bad_source(data_t *data) static void test_read_crc(data_t *data, enum pipe pipe, unsigned flags) { igt_display_t *display = &data->display; - igt_output_t *output = igt_get_single_output_for_pipe(display, pipe); + igt_output_t *output; igt_plane_t *primary...

...uct acpi_table_header dsdt; uint8_t aml[8 + 11 * MAX_VIRT_CPUS]; struct acpi_table_madt madt; - struct acpi_table_lsapic lsapic[MAX_VIRT_CPUS]; + struct acpi_madt_local_sapic lsapic[MAX_VIRT_CPUS]; uint8_t pm1a_event_block[4]; uint8_t pm1a_control_block[1]; uint8_t pm_timer_block[4]; @@ -365,7 +365,7 @@ dom_fw_fake_acpi(domain_t *d, struct fak struct acpi_table_facs *facs = &tables->facs; struct acpi_table_header *dsdt = &tables->dsdt; struct acpi_table_madt *madt = &tables->madt; - struct acpi_table_lsapic *lsapic = tables->lsapic; + struct acpi_madt_loca...

...for NOUVEAU_PLATFORM_DRIVER Signed-off-by: Nicolas Chauvet <kwizart at gmail.com> --- drivers/gpu/drm/nouveau/nouveau_platform.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.c b/drivers/gpu/drm/nouveau/nouveau_platform.c index 3eb6654..9013141 100644 --- a/drivers/gpu/drm/nouveau/nouveau_platform.c +++ b/drivers/gpu/drm/nouveau/nouveau_platform.c @@ -65,3 +65,14 @@ struct platform_driver nouveau_platform_driver = { .probe = nouveau_platform_probe, .remove = nouveau_platform_remove, }; + +#if IS_ENABLED(CONFIG_ARCH_TEGRA_12...

...ned long vaddr = (unsigned long) kvaddr & PAGE_MASK; enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id(); +#ifdef CONFIG_DEBUG_HIGHMEM if (vaddr >= PAGE_OFFSET && vaddr < (unsigned long)high_memory) { dec_preempt_count(); preempt_check_resched(); @@ -68,14 +65,14 @@ void kunmap_atomic(void *kvaddr, enum km if (vaddr != __fix_to_virt(FIX_KMAP_BEGIN+idx)) BUG(); - +#endif /* - * force other mappings to Oops if they'll try to access - * this pte without first remap it + * Force other mappings to Oops if they'll try to access this pte +...

...e (fun chan -> output_string chan ovf); if Python_script.run_command createvm_script json_params [ovf_file] <> 0 diff --git a/v2v/rhv-upload-createvm.py b/v2v/rhv-upload-createvm.py index 1d0e8c95d..ed57a9b20 100644 --- a/v2v/rhv-upload-createvm.py +++ b/v2v/rhv-upload-createvm.py @@ -65,17 +65,14 @@ connection = sdk.Connection( system_service = connection.system_service() -# Get the storage domain UUID and substitute it into the OVF doc. -sds_service = system_service.storage_domains_service() -sd = sds_service.list(search=("name=%s" % params['output_storage'...

...tchdog); @@ -49,6 +51,7 @@ void softlockup_tick(void) { int this_cpu = smp_processor_id(); unsigned long touch_timestamp = per_cpu(touch_timestamp, this_cpu); + unsigned long long now; /* prevent double reports: */ if (per_cpu(print_timestamp, this_cpu) == touch_timestamp || @@ -62,12 +65,14 @@ void softlockup_tick(void) return; } + now = sched_clock(); + /* Wake up the high-prio watchdog task every second: */ - if (time_after(jiffies, touch_timestamp + HZ)) + if (now > (touch_timestamp + SEC_NS)) wake_up_process(per_cpu(watchdog_task, this_cpu)); /* Warn about un...

...tchdog); @@ -49,6 +51,7 @@ void softlockup_tick(void) { int this_cpu = smp_processor_id(); unsigned long touch_timestamp = per_cpu(touch_timestamp, this_cpu); + unsigned long long now; /* prevent double reports: */ if (per_cpu(print_timestamp, this_cpu) == touch_timestamp || @@ -62,12 +65,14 @@ void softlockup_tick(void) return; } + now = sched_clock(); + /* Wake up the high-prio watchdog task every second: */ - if (time_after(jiffies, touch_timestamp + HZ)) + if (now > (touch_timestamp + SEC_NS)) wake_up_process(per_cpu(watchdog_task, this_cpu)); /* Warn about un...

...catterlist *sg, struct sk_buff *skb) +{ + sg->page = virt_to_page(skb_vnet_hdr(skb)); + sg->offset = offset_in_page(skb_vnet_hdr(skb)); + sg->length = sizeof(struct virtio_net_hdr); +} + static bool skb_xmit_done(struct virtqueue *vq) { struct virtnet_info *vi = vq->priv; @@ -52,12 +65,14 @@ static void receive_skb(struct net_devic static void receive_skb(struct net_device *dev, struct sk_buff *skb, unsigned len) { - if (unlikely(len < ETH_HLEN)) { + struct virtio_net_hdr *hdr = skb_vnet_hdr(skb); + + if (unlikely(len < sizeof(struct virtio_net_hdr) + ETH_HLEN)) {...

...catterlist *sg, struct sk_buff *skb) +{ + sg->page = virt_to_page(skb_vnet_hdr(skb)); + sg->offset = offset_in_page(skb_vnet_hdr(skb)); + sg->length = sizeof(struct virtio_net_hdr); +} + static bool skb_xmit_done(struct virtqueue *vq) { struct virtnet_info *vi = vq->priv; @@ -52,12 +65,14 @@ static void receive_skb(struct net_devic static void receive_skb(struct net_device *dev, struct sk_buff *skb, unsigned len) { - if (unlikely(len < ETH_HLEN)) { + struct virtio_net_hdr *hdr = skb_vnet_hdr(skb); + + if (unlikely(len < sizeof(struct virtio_net_hdr) + ETH_HLEN)) {...

...ot;#", :id => "vm_network_section_link" %> + </div> + <div id="vm_network_config"> <div class="clear_row"></div> <div class="clear_row"></div> <div style="float:left;"> @@ -47,15 +65,14 @@ <div style="float:left;"> <%= select_with_label "Network:", 'vm', 'network_id', @networks.insert(0, ""), :style=>"width:250px;" %> </div> - <div style="clear:both;"></div> -...

I just tried to get libguestfs to compile on Ubuntu 11.10 using the latest febootstrap, and the following patches were necessary for me. They are all just reasonable code cleanups *except* for patch 5/5 which is a gross hack for something I don't understand about how Ubuntu 11.10 multiarch support works. Rich.